Compare commits

..

1039 Commits

Author SHA1 Message Date
cutls
64a3440969 TheDesk 20.1.1 (Kawaii) 2020-01-23 01:27:35 +09:00
cutls
6a02d4df6c wip: typo 2020-01-23 00:53:35 +09:00
cutls
4f84ad6c91 wip 2020-01-23 00:51:50 +09:00
cutls
3fe5676f44 Fix: WIP: album artworks 2020-01-23 00:49:36 +09:00
cutls
bc11e75d79 Remove iranai ref 2020-01-23 00:39:06 +09:00
cutls
87f4d86587 Merge branch 'master' of github.com:cutls/TheDesk 2020-01-23 00:30:00 +09:00
cutls
de06c930ea Fix: error when failed upload 2020-01-23 00:29:49 +09:00
cutls
dd056f4c05 Fix: ekkusuesuesu 2020-01-23 00:24:04 +09:00
Cutls
484f320b7f New Crowdin translations (#212)
* New translations setting.json (Romanian)

* New translations setting.json (Portuguese, Brazilian)

* New translations setting.json (Portuguese)

* New translations setting.json (Polish)

* New translations setting.json (Norwegian)

* New translations setting.json (Italian)

* New translations setting.json (Hungarian)

* New translations setting.json (Russian)

* New translations setting.json (Vietnamese)

* New translations setting.json (Ukrainian)

* New translations setting.json (Turkish)

* New translations setting.json (Swedish)

* New translations setting.json (Serbian (Cyrillic))

* New translations setting.json (Chinese Traditional)

* New translations setting.json (Catalan)

* New translations setting.json (Arabic)

* New translations setting.json (Afrikaans)

* New translations setting.json (Spanish)

* New translations setting.json (Hebrew)

* New translations setting.json (Greek)

* New translations setting.json (Finnish)

* New translations setting.json (Dutch)

* New translations setting.json (Danish)
2020-01-15 21:56:54 +09:00
dependabot-preview[bot]
bf94612e2e Bump sweetalert2 from 9.5.3 to 9.5.4 in /app (#205)
Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 9.5.3 to 9.5.4.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v9.5.3...v9.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-13 08:48:47 +09:00
dependabot-preview[bot]
16fe5f07e3 Bump electron-dl from 1.14.0 to 3.0.0 in /app (#209)
Bumps [electron-dl](https://github.com/sindresorhus/electron-dl) from 1.14.0 to 3.0.0.
- [Release notes](https://github.com/sindresorhus/electron-dl/releases)
- [Commits](https://github.com/sindresorhus/electron-dl/compare/v1.14.0...v3.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-13 08:48:23 +09:00
dependabot-preview[bot]
c85ef3c659 Bump electron from 7.1.1 to 7.1.8 in /app (#210)
Bumps [electron](https://github.com/electron/electron) from 7.1.1 to 7.1.8.
- [Release notes](https://github.com/electron/electron/releases)
- [Commits](https://github.com/electron/electron/compare/v7.1.1...v7.1.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-13 08:48:12 +09:00
Cutls
e8910d7e64 New Crowdin translations (#191)
* New translations index.json (Bulgarian)

* New translations main.json (Bulgarian)

* New translations main.json (Bulgarian)

* New translations main.json (Bulgarian)

* New translations main.json (Bulgarian)

* New translations main.json (Bulgarian)

* New translations main.json (Bulgarian)

* New translations main.json (Bulgarian)

* New translations index.json (Spanish, Argentina)

* New translations main.json (Spanish, Argentina)

* New translations main.json (Russian)

* New translations main.json (Romanian)

* New translations main.json (Portuguese, Brazilian)

* New translations main.json (Serbian (Cyrillic))

* New translations main.json (Portuguese)

* New translations main.json (Polish)

* New translations main.json (Norwegian)

* New translations main.json (Turkish)

* New translations main.json (English)

* New translations main.json (Vietnamese)

* New translations main.json (Ukrainian)

* New translations main.json (Swedish)

* New translations main.json (Spanish, Argentina)

* New translations main.json (Spanish)

* New translations main.json (Italian)

* New translations main.json (Czech)

* New translations main.json (Chinese Traditional)

* New translations main.json (Chinese Simplified)

* New translations main.json (Catalan)

* New translations main.json (Bulgarian)

* New translations main.json (Arabic)

* New translations main.json (Afrikaans)

* New translations main.json (Danish)

* New translations main.json (German)

* New translations main.json (Hungarian)

* New translations main.json (Hebrew)

* New translations main.json (Greek)

* New translations main.json (French)

* New translations main.json (Finnish)

* New translations main.json (Dutch)

* New translations setting.json (Russian)

* New translations index.json (Russian)

* New translations setting.json (Romanian)

* New translations index.json (Romanian)

* New translations setting.json (Portuguese, Brazilian)

* New translations index.json (Portuguese, Brazilian)

* New translations setting.json (Portuguese)

* New translations index.json (Portuguese)

* New translations setting.json (Polish)

* New translations index.json (Polish)

* New translations setting.json (Norwegian)

* New translations index.json (Norwegian)

* New translations setting.json (Italian)

* New translations index.json (Serbian (Cyrillic))

* New translations setting.json (Serbian (Cyrillic))

* New translations index.json (Italian)

* New translations index.json (English)

* New translations setting.json (Vietnamese)

* New translations index.json (Vietnamese)

* New translations setting.json (Ukrainian)

* New translations index.json (Ukrainian)

* New translations setting.json (Turkish)

* New translations index.json (Turkish)

* New translations setting.json (Swedish)

* New translations index.json (Swedish)

* New translations setting.json (Spanish, Argentina)

* New translations index.json (Spanish, Argentina)

* New translations setting.json (Spanish)

* New translations index.json (Spanish)

* New translations index.json (Afrikaans)

* New translations setting.json (Catalan)

* New translations setting.json (Czech)

* New translations index.json (Czech)

* New translations setting.json (Chinese Traditional)

* New translations index.json (Chinese Traditional)

* New translations setting.json (Chinese Simplified)

* New translations index.json (Chinese Simplified)

* New translations index.json (Danish)

* New translations index.json (Catalan)

* New translations setting.json (Bulgarian)

* New translations index.json (Bulgarian)

* New translations setting.json (Arabic)

* New translations index.json (Arabic)

* New translations setting.json (Afrikaans)

* New translations setting.json (Hungarian)

* New translations index.json (Hungarian)

* New translations setting.json (Hebrew)

* New translations index.json (Hebrew)

* New translations setting.json (Greek)

* New translations index.json (Greek)

* New translations setting.json (German)

* New translations index.json (German)

* New translations setting.json (Danish)

* New translations setting.json (French)

* New translations index.json (French)

* New translations setting.json (Finnish)

* New translations index.json (Finnish)

* New translations setting.json (Dutch)

* New translations index.json (Dutch)

* New translations setting.json (English)

* New translations main.json (Bulgarian)

* New translations main.json (Arabic)

* New translations main.json (Afrikaans)

* New translations main.json (Romanian)

* New translations main.json (Russian)

* New translations main.json (Serbian (Cyrillic))

* New translations main.json (Portuguese, Brazilian)

* New translations main.json (Portuguese)

* New translations main.json (Polish)

* New translations main.json (English)

* New translations main.json (Vietnamese)

* New translations main.json (Ukrainian)

* New translations main.json (Turkish)

* New translations main.json (Spanish)

* New translations main.json (Swedish)

* New translations main.json (Spanish, Argentina)

* New translations main.json (Norwegian)

* New translations main.json (Dutch)

* New translations main.json (Danish)

* New translations main.json (Czech)

* New translations main.json (Chinese Traditional)

* New translations main.json (Chinese Simplified)

* New translations main.json (Catalan)

* New translations main.json (Finnish)

* New translations main.json (Italian)

* New translations main.json (Hungarian)

* New translations main.json (Hebrew)

* New translations main.json (Greek)

* New translations main.json (German)

* New translations main.json (French)

* New translations main.json (Hungarian)

* New translations main.json (Hebrew)

* New translations main.json (Italian)

* New translations main.json (Greek)

* New translations main.json (German)

* New translations main.json (French)

* New translations main.json (Portuguese)

* New translations main.json (Portuguese, Brazilian)

* New translations main.json (Polish)

* New translations main.json (Norwegian)

* New translations main.json (Chinese Simplified)

* New translations main.json (Catalan)

* New translations main.json (Bulgarian)

* New translations main.json (Arabic)

* New translations main.json (Afrikaans)

* New translations main.json (Chinese Traditional)

* New translations main.json (Finnish)

* New translations main.json (Dutch)

* New translations main.json (Czech)

* New translations main.json (Danish)

* New translations main.json (Turkish)

* New translations main.json (Vietnamese)

* New translations main.json (Ukrainian)

* New translations main.json (English)

* New translations main.json (Swedish)

* New translations main.json (Romanian)

* New translations main.json (Russian)

* New translations main.json (Serbian (Cyrillic))

* New translations main.json (Spanish)

* New translations main.json (Spanish, Argentina)

* New translations acct.json (Spanish)

* New translations index.json (Spanish)

* New translations main.json (Spanish)

* New translations setting.json (Spanish)

* New translations acct.json (Spanish)

* New translations main.json (Spanish)

* New translations setting.json (Spanish)
2020-01-13 08:47:33 +09:00
Cutls
817d159fd9 License of #InstanceTicker (#211)
* Update setting.json

* Japanese

* Japanese(Kansai)
2020-01-13 08:45:29 +09:00
cutls
674ce32a30 revert #208 2020-01-12 22:49:52 +09:00
cutls
8f85016d8c [WIP] fix #208 2020-01-12 20:42:23 +09:00
cutls
ee7ca45b91 npexec #208 2020-01-12 11:38:28 +09:00
cutls
51af1590ad test on #208 2020-01-12 01:23:07 +09:00
cutls
b42b04d769 Revert "Introduce: window-state, with discarded old window size"
This reverts commit ffaa59cf88.
2020-01-08 23:41:32 +09:00
cutls
ffaa59cf88 Introduce: window-state, with discarded old window size 2019-12-23 01:58:24 +09:00
cutls
109170627f Use npx, not global 2019-12-21 11:09:01 +09:00
cutls
553abf90cb Font spacer4 2019-12-20 09:52:57 +09:00
cutls
eccdee7446 Fix: max_toot_chars, Add: custom max_chars, Add: domain list 2019-12-19 01:00:17 +09:00
cutls
b2d98948d2 Add: follow request on notification 2019-12-17 01:11:12 +09:00
cutls
4bcb8104de Update check on setting 2019-12-15 00:52:07 +09:00
cutls
b7c82b4831 add 2019-12-14 23:54:34 +09:00
cutls
626aebef4d TheDesk 20.1.0 (Kawaii) 2019-12-14 23:41:35 +09:00
cutls
32420fecd9 Fix: Poll emoji when refreshed, static emoji #193 2019-12-14 10:29:59 +09:00
cutls
c318803ecd Fix cannot del&red img #185 2019-12-14 10:12:18 +09:00
cutls
adf37f6513 Add: auto resize, auto stamp 2019-12-14 01:54:40 +09:00
cutls
0dcc0ff0ac Fix: import and export 2019-12-14 00:48:34 +09:00
cutls
f30749d752 Fix: unvisible leading choice when shared polls 2019-12-13 02:07:33 +09:00
cutls
af459aa93a Fix: openFinder dialog 2019-12-12 00:17:22 +09:00
cutls
e190cf3393 Merge branch 'master' of github.com:cutls/TheDesk 2019-12-12 00:06:51 +09:00
cutls
9f6c14ced0 WIP: to null-safety app 2019-12-12 00:06:40 +09:00
cutls
320576f288 For Pleroma move type notif 2019-12-12 00:06:12 +09:00
cutls
7366d9ce98 Cannot unfav/unBT 2019-12-12 00:05:40 +09:00
dependabot-preview[bot]
6da37a6cbb Bump sweetalert2 from 9.4.0 to 9.5.3 in /app (#198)
Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 9.4.0 to 9.5.3.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v9.4.0...v9.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 09:43:59 +09:00
cutls
140e47d842 Add unknown notf type of Pleroma, 'move' 2019-12-10 23:24:16 +09:00
cutls
44128d8801 delete and redraft 2019-12-08 14:50:56 +09:00
cutls
046dbc5559 Cannot img <- / -> 2019-12-08 00:51:49 +09:00
cutls
f46b05dca8 TheDesk 20.0.6 (Kawaii) 2019-12-01 20:28:20 +09:00
cutls
8844320fc5 TheDesk 20.0.5 (Kawaii) 2019-11-27 23:13:19 +09:00
cutls
9f1aeb2b58 IDE key 2019-11-27 23:03:18 +09:00
cutls
89ba321890 Merge branch 'master' of github.com:cutls/TheDesk 2019-11-27 21:03:45 +09:00
cutls
0ede195a5a TheDesk 20.0.5 (Kawaii) checking 2019-11-27 21:03:32 +09:00
Cutls
c305ed5627 New Crowdin translations (#188)
* New translations index.json (Hungarian)

* New translations index.json (Hebrew)

* New translations index.json (Greek)

* New translations index.json (German)

* New translations index.json (French)

* New translations index.json (Finnish)

* New translations index.json (Dutch)
2019-11-27 20:58:05 +09:00
Cutls
e58989f021 New Crowdin translations (#182)
* New translations index.json (Spanish, Argentina)

* New translations index.json (Spanish, Argentina)

* New translations main.json (Spanish, Argentina)

* New translations setting.json (Spanish, Argentina)

* New translations update.json (Spanish, Argentina)

* New translations main.json (Chinese Traditional)

* New translations main.json (Chinese Simplified)

* New translations main.json (Catalan)

* New translations main.json (Afrikaans)

* New translations main.json (Arabic)

* New translations main.json (Bulgarian)

* New translations main.json (Serbian (Cyrillic))

* New translations main.json (Russian)

* New translations main.json (Romanian)

* New translations main.json (Portuguese, Brazilian)

* New translations main.json (Portuguese)

* New translations main.json (Spanish)

* New translations main.json (English)

* New translations main.json (Vietnamese)

* New translations main.json (Ukrainian)

* New translations main.json (Turkish)

* New translations main.json (Swedish)

* New translations main.json (Spanish, Argentina)

* New translations main.json (Dutch)

* New translations main.json (French)

* New translations main.json (Finnish)

* New translations main.json (Danish)

* New translations main.json (Czech)

* New translations main.json (German)

* New translations main.json (Polish)

* New translations main.json (Norwegian)

* New translations main.json (Italian)

* New translations main.json (Hungarian)

* New translations main.json (Hebrew)

* New translations main.json (Greek)

* New translations main.json (German)

* New translations main.json (German)

* New translations index.json (Bulgarian)

* New translations main.json (Bulgarian)

* New translations main.json (Bulgarian)

* New translations main.json (Russian)

* New translations main.json (Romanian)

* New translations main.json (Portuguese, Brazilian)

* New translations main.json (Serbian (Cyrillic))

* New translations main.json (Portuguese)

* New translations main.json (Polish)

* New translations main.json (Norwegian)

* New translations main.json (Turkish)

* New translations main.json (English)

* New translations main.json (Vietnamese)

* New translations main.json (Ukrainian)

* New translations main.json (Swedish)

* New translations main.json (Spanish, Argentina)

* New translations main.json (Spanish)

* New translations main.json (Italian)

* New translations main.json (Czech)

* New translations main.json (Chinese Traditional)

* New translations main.json (Chinese Simplified)

* New translations main.json (Catalan)

* New translations main.json (Bulgarian)

* New translations main.json (Arabic)

* New translations main.json (Afrikaans)

* New translations main.json (Danish)

* New translations main.json (German)

* New translations main.json (Hungarian)

* New translations main.json (Hebrew)

* New translations main.json (Greek)

* New translations main.json (French)

* New translations main.json (Finnish)

* New translations main.json (Dutch)

* New translations acct.json (Russian)

* New translations acct.json (Russian)

* New translations index.json (Russian)

* New translations main.json (Russian)

* New translations setting.json (Russian)

* New translations index.json (Russian)

* New translations main.json (Russian)

* New translations setting.json (Russian)

* New translations index.json (Russian)

* New translations main.json (Russian)

* New translations index.json (Russian)

* New translations main.json (Russian)

* New translations setting.json (Russian)

* New translations index.json (Russian)

* New translations setting.json (Russian)

* New translations setting.json (Russian)

* New translations main.json (Russian)

* New translations main.json (Romanian)

* New translations main.json (Portuguese, Brazilian)

* New translations main.json (Serbian (Cyrillic))

* New translations main.json (Portuguese)

* New translations main.json (Polish)

* New translations main.json (Norwegian)

* New translations main.json (Turkish)

* New translations main.json (English)

* New translations main.json (Vietnamese)

* New translations main.json (Ukrainian)

* New translations main.json (Swedish)

* New translations main.json (Spanish, Argentina)

* New translations main.json (Spanish)

* New translations main.json (Italian)

* New translations main.json (Czech)

* New translations main.json (Chinese Traditional)

* New translations main.json (Chinese Simplified)

* New translations main.json (Catalan)

* New translations main.json (Bulgarian)

* New translations main.json (Arabic)

* New translations main.json (Afrikaans)

* New translations main.json (Danish)

* New translations main.json (German)

* New translations main.json (Hungarian)

* New translations main.json (Hebrew)

* New translations main.json (Greek)

* New translations main.json (French)

* New translations main.json (Finnish)

* New translations main.json (Dutch)

* New translations index.json (Russian)

* New translations index.json (Romanian)

* New translations index.json (Portuguese, Brazilian)

* New translations index.json (Portuguese)

* New translations index.json (Polish)

* New translations index.json (Norwegian)

* New translations index.json (Serbian (Cyrillic))

* New translations index.json (Italian)

* New translations index.json (English)

* New translations index.json (Vietnamese)

* New translations index.json (Ukrainian)

* New translations index.json (Turkish)

* New translations index.json (Swedish)

* New translations index.json (Spanish, Argentina)

* New translations index.json (Spanish)

* New translations index.json (Afrikaans)

* New translations index.json (Czech)

* New translations index.json (Chinese Traditional)

* New translations index.json (Chinese Simplified)

* New translations index.json (Danish)

* New translations index.json (Catalan)

* New translations index.json (Bulgarian)

* New translations index.json (Arabic)
2019-11-27 20:56:45 +09:00
Cutls
f88a3169c4 New translations index.json (Arabic) 2019-11-27 20:56:38 +09:00
Cutls
8aa9de05f9 New translations index.json (Bulgarian) 2019-11-27 20:56:35 +09:00
Cutls
e6ee50a6ea New translations index.json (Catalan) 2019-11-27 20:56:33 +09:00
Cutls
802988cb77 New translations index.json (Danish) 2019-11-27 20:56:31 +09:00
Cutls
3afe00e208 New translations index.json (Chinese Simplified) 2019-11-27 20:56:29 +09:00
Cutls
0db238b023 New translations index.json (Chinese Traditional) 2019-11-27 20:56:26 +09:00
Cutls
3c07bbaf38 New translations index.json (Czech) 2019-11-27 20:56:23 +09:00
Cutls
951d4d7251 New translations index.json (Afrikaans) 2019-11-27 20:56:19 +09:00
Cutls
dc789ad9c0 New translations index.json (Spanish) 2019-11-27 20:56:17 +09:00
Cutls
c5cbc07b2b New translations index.json (Spanish, Argentina) 2019-11-27 20:56:14 +09:00
Cutls
101212de01 New translations index.json (Swedish) 2019-11-27 20:56:11 +09:00
Cutls
6a977d6484 New translations index.json (Turkish) 2019-11-27 20:56:07 +09:00
Cutls
4ed28c4d6c New translations index.json (Ukrainian) 2019-11-27 20:56:04 +09:00
dependabot-preview[bot]
136d101588 Bump sweetalert2 from 9.3.16 to 9.4.0 in /app (#184)
Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 9.3.16 to 9.4.0.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v9.3.16...v9.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 20:56:03 +09:00
Cutls
e55a211269 New translations index.json (Vietnamese) 2019-11-27 20:56:01 +09:00
Cutls
89e01ec6e2 New translations index.json (English) 2019-11-27 20:55:58 +09:00
Cutls
06c9e3437a New translations index.json (Italian) 2019-11-27 20:55:55 +09:00
Cutls
a24d058ee5 New translations index.json (Serbian (Cyrillic)) 2019-11-27 20:55:54 +09:00
Cutls
176c692e46 New translations index.json (Norwegian) 2019-11-27 20:55:52 +09:00
Cutls
17505711d7 New translations index.json (Polish) 2019-11-27 20:55:49 +09:00
Cutls
e359347ae7 New translations index.json (Portuguese) 2019-11-27 20:55:45 +09:00
Cutls
51dbf712f7 New translations index.json (Portuguese, Brazilian) 2019-11-27 20:55:42 +09:00
Cutls
30bd7abec1 New translations index.json (Romanian) 2019-11-27 20:55:39 +09:00
Cutls
370af944d8 New translations index.json (Russian) 2019-11-27 20:55:36 +09:00
dependabot-preview[bot]
ccdd30f372 Bump sumchecker from 3.0.0 to 3.0.1 in /app (#186)
Bumps [sumchecker](https://github.com/malept/sumchecker) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/malept/sumchecker/releases)
- [Changelog](https://github.com/malept/sumchecker/blob/master/NEWS.md)
- [Commits](https://github.com/malept/sumchecker/compare/v3.0.0...v3.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 20:55:20 +09:00
dependabot-preview[bot]
157aec934d Bump jimp from 0.8.5 to 0.9.1 in /app (#187)
Bumps [jimp](https://github.com/oliver-moran/jimp) from 0.8.5 to 0.9.1.
- [Release notes](https://github.com/oliver-moran/jimp/releases)
- [Changelog](https://github.com/oliver-moran/jimp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/oliver-moran/jimp/compare/v0.8.5...v0.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 20:55:12 +09:00
cutls
a6d8bfd874 Add: bug arunyakedo button 2019-11-27 20:53:46 +09:00
cutls
ed8dc492c5 Tag trending design 2019-11-27 20:53:34 +09:00
cutls
87aee3764b #185 in reply id 2019-11-26 23:48:22 +09:00
Cutls
692f01885f New translations main.json (Dutch) 2019-11-26 23:29:32 +09:00
Cutls
8b4537f61c New translations main.json (Finnish) 2019-11-26 23:29:29 +09:00
Cutls
74abc5d150 New translations main.json (French) 2019-11-26 23:29:26 +09:00
Cutls
968dd67bda New translations main.json (Greek) 2019-11-26 23:29:17 +09:00
Cutls
08b38f2789 New translations main.json (Hebrew) 2019-11-26 23:29:14 +09:00
Cutls
8c826ccc3f New translations main.json (Hungarian) 2019-11-26 23:29:11 +09:00
Cutls
f76fa5b13a New translations main.json (German) 2019-11-26 23:29:08 +09:00
Cutls
2cc42fd3e0 New translations main.json (Danish) 2019-11-26 23:29:06 +09:00
Cutls
4eabfad002 New translations main.json (Afrikaans) 2019-11-26 23:29:04 +09:00
Cutls
fa6304f244 New translations main.json (Arabic) 2019-11-26 23:29:00 +09:00
Cutls
27b0a6e47e New translations main.json (Bulgarian) 2019-11-26 23:28:56 +09:00
Cutls
6aca5a7b2b New translations main.json (Catalan) 2019-11-26 23:28:51 +09:00
Cutls
c0b9fc96e7 New translations main.json (Chinese Simplified) 2019-11-26 23:28:50 +09:00
Cutls
84b0defe3b New translations main.json (Chinese Traditional) 2019-11-26 23:28:45 +09:00
Cutls
49e6f89015 New translations main.json (Czech) 2019-11-26 23:28:42 +09:00
Cutls
e9abe29fc3 New translations main.json (Italian) 2019-11-26 23:28:37 +09:00
Cutls
4c26a76cd4 New translations main.json (Spanish) 2019-11-26 23:28:35 +09:00
Cutls
ce9bd51a92 New translations main.json (Spanish, Argentina) 2019-11-26 23:28:31 +09:00
Cutls
f6dad03f7f New translations main.json (Swedish) 2019-11-26 23:28:28 +09:00
Cutls
0ee1ca5086 New translations main.json (Ukrainian) 2019-11-26 23:28:23 +09:00
Cutls
088c370d0e New translations main.json (Vietnamese) 2019-11-26 23:28:20 +09:00
Cutls
db934fb96b New translations main.json (English) 2019-11-26 23:28:17 +09:00
Cutls
ef3bae0c0f New translations main.json (Turkish) 2019-11-26 23:28:15 +09:00
Cutls
bcf7d5f6ae New translations main.json (Norwegian) 2019-11-26 23:28:10 +09:00
Cutls
bfaee4533c New translations main.json (Polish) 2019-11-26 23:28:07 +09:00
Cutls
cf24c2042b New translations main.json (Portuguese) 2019-11-26 23:28:03 +09:00
Cutls
be9a52c221 New translations main.json (Serbian (Cyrillic)) 2019-11-26 23:28:01 +09:00
Cutls
142098c4e7 New translations main.json (Portuguese, Brazilian) 2019-11-26 23:27:57 +09:00
Cutls
b4da761c5b New translations main.json (Romanian) 2019-11-26 23:27:54 +09:00
Cutls
48d1dd14c1 New translations main.json (Russian) 2019-11-26 23:27:50 +09:00
cutls
3243602653 Add NSFW on del and redraft #185 2019-11-26 23:26:04 +09:00
cutls
c2cfbd5583 Fix: #183 2019-11-26 23:20:03 +09:00
Cutls
6105152926 New translations setting.json (Russian) 2019-11-26 12:23:35 +09:00
Cutls
7ae073dec4 New translations setting.json (Russian) 2019-11-26 12:13:05 +09:00
Cutls
d6933a05a7 New translations index.json (Russian) 2019-11-26 12:13:03 +09:00
Cutls
aa53700ffd New translations setting.json (Russian) 2019-11-26 12:03:41 +09:00
Cutls
6deec5758d New translations main.json (Russian) 2019-11-26 12:03:40 +09:00
Cutls
ef68d2b421 New translations index.json (Russian) 2019-11-26 12:03:37 +09:00
Cutls
496106476b New translations main.json (Russian) 2019-11-26 11:53:14 +09:00
Cutls
7dd48c6da6 New translations index.json (Russian) 2019-11-26 11:53:12 +09:00
Cutls
6435f55d0b New translations setting.json (Russian) 2019-11-26 11:43:49 +09:00
Cutls
a5c7494ba2 New translations main.json (Russian) 2019-11-26 11:43:48 +09:00
Cutls
ed0e7cc615 New translations index.json (Russian) 2019-11-26 11:43:47 +09:00
Cutls
529a08dd01 New translations setting.json (Russian) 2019-11-26 11:36:32 +09:00
Cutls
3a3e4159d9 New translations main.json (Russian) 2019-11-26 11:36:30 +09:00
Cutls
fbbcf5de7f New translations index.json (Russian) 2019-11-26 11:36:28 +09:00
Cutls
101f0afa07 New translations acct.json (Russian) 2019-11-26 11:36:27 +09:00
Cutls
298ef0547b New translations acct.json (Russian) 2019-11-26 11:23:59 +09:00
cutls
b948608ce3 nice vote 2019-11-26 01:26:17 +09:00
Cutls
ec16bf81ed New translations main.json (Dutch) 2019-11-26 01:15:37 +09:00
Cutls
c6b63d1d0c New translations main.json (Finnish) 2019-11-26 01:15:34 +09:00
Cutls
b7397bccb0 New translations main.json (French) 2019-11-26 01:15:31 +09:00
Cutls
95606ed251 New translations main.json (Greek) 2019-11-26 01:15:26 +09:00
Cutls
5e3a89a654 New translations main.json (Hebrew) 2019-11-26 01:15:22 +09:00
Cutls
2a0a9fd205 New translations main.json (Hungarian) 2019-11-26 01:15:19 +09:00
Cutls
34e6a3bb72 New translations main.json (German) 2019-11-26 01:15:16 +09:00
Cutls
6b44ca625f New translations main.json (Danish) 2019-11-26 01:15:13 +09:00
Cutls
2082bb4662 New translations main.json (Afrikaans) 2019-11-26 01:15:10 +09:00
Cutls
5c5161ed3f New translations main.json (Arabic) 2019-11-26 01:15:06 +09:00
Cutls
3713a06750 New translations main.json (Bulgarian) 2019-11-26 01:15:03 +09:00
Cutls
a897d517cf New translations main.json (Catalan) 2019-11-26 01:14:58 +09:00
Cutls
df9c022563 New translations main.json (Chinese Simplified) 2019-11-26 01:14:56 +09:00
Cutls
3796b79872 New translations main.json (Chinese Traditional) 2019-11-26 01:14:52 +09:00
Cutls
f74eab450f New translations main.json (Czech) 2019-11-26 01:14:50 +09:00
Cutls
493066df76 New translations main.json (Italian) 2019-11-26 01:14:46 +09:00
Cutls
b89b5ea108 New translations main.json (Spanish) 2019-11-26 01:14:43 +09:00
Cutls
3dcfe1812d New translations main.json (Spanish, Argentina) 2019-11-26 01:14:40 +09:00
Cutls
7b9d084cde New translations main.json (Swedish) 2019-11-26 01:14:36 +09:00
Cutls
f80ec5e6c3 New translations main.json (Ukrainian) 2019-11-26 01:14:30 +09:00
Cutls
773e482d56 New translations main.json (Vietnamese) 2019-11-26 01:14:26 +09:00
Cutls
6a1910ec9d New translations main.json (English) 2019-11-26 01:14:23 +09:00
Cutls
a53b8fd884 New translations main.json (Turkish) 2019-11-26 01:14:21 +09:00
Cutls
5d9bb0ff19 New translations main.json (Norwegian) 2019-11-26 01:14:15 +09:00
Cutls
b27c3c0940 New translations main.json (Polish) 2019-11-26 01:14:12 +09:00
Cutls
e8f05ac324 New translations main.json (Portuguese) 2019-11-26 01:14:10 +09:00
Cutls
279c6c3514 New translations main.json (Serbian (Cyrillic)) 2019-11-26 01:14:08 +09:00
Cutls
61a6a0f4d9 New translations main.json (Portuguese, Brazilian) 2019-11-26 01:14:04 +09:00
Cutls
9e84456b46 New translations main.json (Romanian) 2019-11-26 01:14:01 +09:00
Cutls
3d65080e28 New translations main.json (Russian) 2019-11-26 01:13:56 +09:00
cutls
2cc8551386 Improve: vote 2019-11-26 01:02:15 +09:00
Cutls
2140757d5b New translations main.json (Bulgarian) 2019-11-25 21:55:35 +09:00
Cutls
f5226a6a7d New translations main.json (Bulgarian) 2019-11-25 21:45:11 +09:00
Cutls
6addb35131 New translations index.json (Bulgarian) 2019-11-25 21:45:09 +09:00
Cutls
ebba76cb92 New translations main.json (German) 2019-11-25 16:14:20 +09:00
Cutls
e3c6d81a23 New translations main.json (German) 2019-11-25 16:04:32 +09:00
cutls
b35ecbf79c hashtag 2019-11-24 23:07:21 +09:00
Cutls
3e3387e4bd New translations main.json (Greek) 2019-11-24 22:14:56 +09:00
Cutls
4b8c7fdaf3 New translations main.json (Hebrew) 2019-11-24 22:14:53 +09:00
Cutls
07dcf40d13 New translations main.json (Hungarian) 2019-11-24 22:14:50 +09:00
Cutls
1962e9265f New translations main.json (Italian) 2019-11-24 22:14:48 +09:00
Cutls
92b692a958 New translations main.json (Norwegian) 2019-11-24 22:14:44 +09:00
Cutls
a335813b42 New translations main.json (Polish) 2019-11-24 22:14:39 +09:00
Cutls
7579cf6636 New translations main.json (German) 2019-11-24 22:14:38 +09:00
Cutls
25316d8dcf New translations main.json (Czech) 2019-11-24 22:14:36 +09:00
Cutls
b87a28521f New translations main.json (Danish) 2019-11-24 22:14:33 +09:00
Cutls
e67d4e2e4f New translations main.json (Finnish) 2019-11-24 22:14:29 +09:00
Cutls
ea8295bb6b New translations main.json (French) 2019-11-24 22:14:26 +09:00
Cutls
3dfa92e091 New translations main.json (Dutch) 2019-11-24 22:14:24 +09:00
Cutls
9a9907b264 New translations main.json (Spanish, Argentina) 2019-11-24 22:14:20 +09:00
Cutls
e6b711b4b4 New translations main.json (Swedish) 2019-11-24 22:14:17 +09:00
Cutls
3375222582 New translations main.json (Turkish) 2019-11-24 22:14:14 +09:00
Cutls
b6a9284cbf New translations main.json (Ukrainian) 2019-11-24 22:14:11 +09:00
Cutls
7462c2195d New translations main.json (Vietnamese) 2019-11-24 22:14:09 +09:00
Cutls
01b4d0240b New translations main.json (English) 2019-11-24 22:14:05 +09:00
Cutls
663fed681d New translations main.json (Spanish) 2019-11-24 22:14:03 +09:00
Cutls
16d02b5507 New translations main.json (Portuguese) 2019-11-24 22:14:01 +09:00
Cutls
73ba6ff27a New translations main.json (Portuguese, Brazilian) 2019-11-24 22:13:58 +09:00
Cutls
d2b0bf0927 New translations main.json (Romanian) 2019-11-24 22:13:56 +09:00
Cutls
e653beee09 New translations main.json (Russian) 2019-11-24 22:13:52 +09:00
Cutls
3491c9b24b New translations main.json (Serbian (Cyrillic)) 2019-11-24 22:13:49 +09:00
Cutls
e328c0fb6e New translations main.json (Bulgarian) 2019-11-24 22:13:47 +09:00
Cutls
fdf1f34365 New translations main.json (Arabic) 2019-11-24 22:13:44 +09:00
Cutls
9fe22338a9 New translations main.json (Afrikaans) 2019-11-24 22:13:43 +09:00
Cutls
80ac4a55d3 New translations main.json (Catalan) 2019-11-24 22:13:39 +09:00
Cutls
c600009722 New translations main.json (Chinese Simplified) 2019-11-24 22:13:36 +09:00
Cutls
256e7b0f09 New translations main.json (Chinese Traditional) 2019-11-24 22:13:33 +09:00
cutls
ce72432039 Merge branch 'master' of github.com:cutls/TheDesk 2019-11-24 22:12:25 +09:00
cutls
b3689fe297 WIP: tag manager 2019-11-24 22:12:14 +09:00
Cutls
0b58690ddd New translations update.json (Spanish, Argentina) 2019-11-24 20:54:11 +09:00
Cutls
e598ab32cf New translations setting.json (Spanish, Argentina) 2019-11-24 20:54:10 +09:00
Cutls
001892dcee New translations main.json (Spanish, Argentina) 2019-11-24 20:54:09 +09:00
Cutls
a89e1202e1 New translations index.json (Spanish, Argentina) 2019-11-24 20:54:07 +09:00
Cutls
f9c8fb727c New translations index.json (Spanish, Argentina) 2019-11-24 20:44:08 +09:00
Cutls
4a6e8c733f New Crowdin translations (#175)
* New translations main.json (Russian)

* New translations main.json (Romanian)

* New translations main.json (Portuguese, Brazilian)

* New translations main.json (Serbian (Cyrillic))

* New translations main.json (Portuguese)

* New translations main.json (Polish)

* New translations main.json (Norwegian)

* New translations main.json (Turkish)

* New translations main.json (English)

* New translations main.json (Vietnamese)

* New translations main.json (Ukrainian)

* New translations main.json (Swedish)

* New translations main.json (Spanish, Argentina)

* New translations main.json (Spanish)

* New translations main.json (Italian)

* New translations main.json (Czech)

* New translations main.json (Chinese Traditional)

* New translations main.json (Chinese Simplified)

* New translations main.json (Catalan)

* New translations main.json (Bulgarian)

* New translations main.json (Arabic)

* New translations main.json (Afrikaans)

* New translations main.json (Danish)

* New translations main.json (German)

* New translations main.json (Hungarian)

* New translations main.json (Hebrew)

* New translations main.json (Greek)

* New translations main.json (French)

* New translations main.json (Finnish)

* New translations main.json (Dutch)

* New translations index.json (Czech)

* New translations main.json (Czech)

* New translations index.json (German)

* New translations main.json (German)

* New translations main.json (German)

* New translations setting.json (German)

* New translations update.json (German)
2019-11-22 01:35:39 +09:00
dependabot-preview[bot]
de2ac24382 Bump electron-rebuild from 1.8.6 to 1.8.8 in /app (#179)
Bumps [electron-rebuild](https://github.com/electron/electron-rebuild) from 1.8.6 to 1.8.8.
- [Release notes](https://github.com/electron/electron-rebuild/releases)
- [Changelog](https://github.com/electron/electron-rebuild/blob/master/.releaserc.json)
- [Commits](https://github.com/electron/electron-rebuild/compare/v1.8.6...v1.8.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-22 01:35:07 +09:00
dependabot-preview[bot]
e7aa01c547 Bump sweetalert2 from 9.3.10 to 9.3.16 in /app (#178)
Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 9.3.10 to 9.3.16.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v9.3.10...v9.3.16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-22 01:34:56 +09:00
cutls
72b060e7ae cannnot use font-manager 0.3.1, released today 2019-11-19 01:21:35 +09:00
cutls
2a99a79d37 TheDesk 20.0.4 (Kawaii) 2019-11-19 00:56:40 +09:00
Cutls
d1e6fac1b0 Delete LATEST.md 2019-11-18 02:35:45 +09:00
Cutls
63802c98a3 Delete ver.json 2019-11-18 02:35:32 +09:00
Cutls
3bd8520e7c Delete mastodon_data.json 2019-11-18 02:35:20 +09:00
Cutls
662c15da93 Delete LICENSE.md 2019-11-18 02:35:09 +09:00
dependabot-preview[bot]
dd0fd325b8 Bump sweetalert2 from 9.3.5 to 9.3.10 in /app (#174)
Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 9.3.5 to 9.3.10.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v9.3.5...v9.3.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-18 01:13:55 +09:00
Cutls
b772b03ef2 New Crowdin translations (#171)
* New translations main.json (Russian)

* New translations main.json (Romanian)

* New translations main.json (Portuguese, Brazilian)

* New translations main.json (Serbian (Cyrillic))

* New translations main.json (Portuguese)

* New translations main.json (Polish)

* New translations main.json (Norwegian)

* New translations main.json (Turkish)

* New translations main.json (English)

* New translations main.json (Vietnamese)

* New translations main.json (Ukrainian)

* New translations main.json (Swedish)

* New translations main.json (Spanish, Argentina)

* New translations main.json (Spanish)

* New translations main.json (Italian)

* New translations main.json (Czech)

* New translations main.json (Chinese Traditional)

* New translations main.json (Chinese Simplified)

* New translations main.json (Catalan)

* New translations main.json (Bulgarian)

* New translations main.json (Arabic)

* New translations main.json (Afrikaans)

* New translations main.json (Danish)

* New translations main.json (German)

* New translations main.json (Hungarian)

* New translations main.json (Hebrew)

* New translations main.json (Greek)

* New translations main.json (French)

* New translations main.json (Finnish)

* New translations main.json (Dutch)

* New translations main.json (Finnish)

* New translations main.json (French)

* New translations main.json (German)

* New translations main.json (Greek)

* New translations main.json (Norwegian)

* New translations main.json (Italian)

* New translations main.json (Hungarian)

* New translations main.json (Hebrew)

* New translations main.json (Dutch)

* New translations main.json (Afrikaans)

* New translations main.json (Arabic)

* New translations main.json (Bulgarian)

* New translations main.json (Catalan)

* New translations main.json (Czech)

* New translations main.json (Chinese Simplified)

* New translations main.json (Danish)

* New translations main.json (Chinese Traditional)

* New translations main.json (Swedish)

* New translations main.json (Spanish, Argentina)

* New translations main.json (Turkish)

* New translations main.json (Vietnamese)

* New translations main.json (Ukrainian)

* New translations main.json (Spanish)

* New translations main.json (Polish)

* New translations main.json (Portuguese)

* New translations main.json (Portuguese, Brazilian)

* New translations main.json (Romanian)

* New translations main.json (Russian)

* New translations main.json (Serbian (Cyrillic))

* New translations main.json (Russian)

* New translations main.json (Romanian)

* New translations main.json (Portuguese, Brazilian)

* New translations main.json (Serbian (Cyrillic))

* New translations main.json (Portuguese)

* New translations main.json (Polish)

* New translations main.json (Norwegian)

* New translations main.json (Turkish)

* New translations main.json (English)

* New translations main.json (Vietnamese)

* New translations main.json (Ukrainian)

* New translations main.json (Swedish)

* New translations main.json (Spanish, Argentina)

* New translations main.json (Spanish)

* New translations main.json (Italian)

* New translations main.json (Czech)

* New translations main.json (Chinese Traditional)

* New translations main.json (Chinese Simplified)

* New translations main.json (Catalan)

* New translations main.json (Bulgarian)

* New translations main.json (Arabic)

* New translations main.json (Afrikaans)

* New translations main.json (Danish)

* New translations main.json (German)

* New translations main.json (Hungarian)

* New translations main.json (Hebrew)

* New translations main.json (Greek)

* New translations main.json (French)

* New translations main.json (Finnish)

* New translations main.json (Dutch)

* New translations setting.json (Russian)

* New translations main.json (Russian)

* New translations index.json (Russian)

* New translations setting.json (Romanian)

* New translations main.json (Romanian)

* New translations index.json (Romanian)

* New translations setting.json (Portuguese, Brazilian)

* New translations main.json (Portuguese, Brazilian)

* New translations index.json (Portuguese, Brazilian)

* New translations setting.json (Portuguese)

* New translations main.json (Serbian (Cyrillic))

* New translations main.json (Portuguese)

* New translations index.json (Portuguese)

* New translations setting.json (Polish)

* New translations main.json (Polish)

* New translations index.json (Polish)

* New translations setting.json (Norwegian)

* New translations main.json (Norwegian)

* New translations index.json (Norwegian)

* New translations setting.json (Italian)

* New translations index.json (Serbian (Cyrillic))

* New translations setting.json (Serbian (Cyrillic))

* New translations index.json (Italian)

* New translations main.json (Turkish)

* New translations main.json (English)

* New translations index.json (English)

* New translations setting.json (Vietnamese)

* New translations main.json (Vietnamese)

* New translations index.json (Vietnamese)

* New translations setting.json (Ukrainian)

* New translations main.json (Ukrainian)

* New translations index.json (Ukrainian)

* New translations setting.json (Turkish)

* New translations index.json (Turkish)

* New translations setting.json (Swedish)

* New translations main.json (Swedish)

* New translations index.json (Swedish)

* New translations setting.json (Spanish, Argentina)

* New translations main.json (Spanish, Argentina)

* New translations index.json (Spanish, Argentina)

* New translations setting.json (Spanish)

* New translations main.json (Spanish)

* New translations index.json (Spanish)

* New translations main.json (Italian)

* New translations index.json (Afrikaans)

* New translations setting.json (Catalan)

* New translations setting.json (Czech)

* New translations main.json (Czech)

* New translations index.json (Czech)

* New translations setting.json (Chinese Traditional)

* New translations main.json (Chinese Traditional)

* New translations index.json (Chinese Traditional)

* New translations setting.json (Chinese Simplified)

* New translations main.json (Chinese Simplified)

* New translations index.json (Chinese Simplified)

* New translations main.json (Catalan)

* New translations index.json (Danish)

* New translations index.json (Catalan)

* New translations setting.json (Bulgarian)

* New translations main.json (Bulgarian)

* New translations index.json (Bulgarian)

* New translations setting.json (Arabic)

* New translations main.json (Arabic)

* New translations index.json (Arabic)

* New translations setting.json (Afrikaans)

* New translations main.json (Afrikaans)

* New translations main.json (Danish)

* New translations setting.json (Hungarian)

* New translations main.json (German)

* New translations main.json (Hungarian)

* New translations index.json (Hungarian)

* New translations setting.json (Hebrew)

* New translations main.json (Hebrew)

* New translations index.json (Hebrew)

* New translations setting.json (Greek)

* New translations main.json (Greek)

* New translations index.json (Greek)

* New translations setting.json (German)

* New translations index.json (German)

* New translations setting.json (Danish)

* New translations setting.json (French)

* New translations main.json (French)

* New translations index.json (French)

* New translations setting.json (Finnish)

* New translations main.json (Finnish)

* New translations index.json (Finnish)

* New translations setting.json (Dutch)

* New translations main.json (Dutch)

* New translations index.json (Dutch)

* New translations setting.json (English)

* New translations main.json (Russian)

* New translations main.json (Romanian)

* New translations main.json (Portuguese, Brazilian)

* New translations main.json (Serbian (Cyrillic))

* New translations main.json (Portuguese)

* New translations main.json (Polish)

* New translations main.json (Norwegian)

* New translations main.json (Turkish)

* New translations main.json (English)

* New translations main.json (Vietnamese)

* New translations main.json (Ukrainian)

* New translations main.json (Swedish)

* New translations main.json (Spanish, Argentina)

* New translations main.json (Spanish)

* New translations main.json (Italian)

* New translations main.json (Czech)

* New translations main.json (Chinese Traditional)

* New translations main.json (Chinese Simplified)

* New translations main.json (Catalan)

* New translations main.json (Bulgarian)

* New translations main.json (Arabic)

* New translations main.json (Afrikaans)

* New translations main.json (Danish)

* New translations main.json (German)

* New translations main.json (Hungarian)

* New translations main.json (Hebrew)

* New translations main.json (Greek)

* New translations main.json (French)

* New translations main.json (Finnish)

* New translations main.json (Dutch)

* New translations acct.json (Norwegian)

* New translations index.json (Norwegian)

* New translations main.json (Norwegian)

* New translations setting.json (Norwegian)

* New translations index.json (Norwegian)

* New translations main.json (Norwegian)

* New translations setting.json (Norwegian)

* New translations acct.json (Norwegian)

* New translations index.json (Norwegian)

* New translations main.json (Norwegian)

* New translations setting.json (Norwegian)

* New translations update.json (Norwegian)

* New translations index.json (Norwegian)

* New translations main.json (Norwegian)

* New translations index.json (Norwegian)

* New translations main.json (Norwegian)

* New translations index.json (Norwegian)

* New translations main.json (Norwegian)

* New translations setting.json (Norwegian)

* New translations update.json (Norwegian)

* New translations index.json (Norwegian)

* New translations main.json (Norwegian)

* New translations setting.json (Norwegian)
2019-11-18 01:13:41 +09:00
cutls
eda554eb8f Fix: fetch remote acct data 2019-11-18 01:08:55 +09:00
cutls
2936bd1e5a fix 2019-11-18 01:08:38 +09:00
cutls
df2f86f577 Fix: translation and fetch toot by URL 2019-11-18 01:08:25 +09:00
cutls
b9d1899cf2 typo 2019-11-18 01:07:59 +09:00
cutls
b01497e391 better coding :) 2019-11-18 01:07:44 +09:00
cutls
af38681293 When IntegTL str closed, icons become red 2019-11-16 23:04:31 +09:00
cutls
022565e176 Fix twitter link flied 2019-11-16 22:55:49 +09:00
cutls
00863d6917 Fix: Link analyzer not working 2019-11-16 22:47:18 +09:00
cutls
e345b3a479 Nice insert emoji and tags yeah 2019-11-16 22:02:42 +09:00
cutls
fe32723ad5 Fix: moreLoading 2019-11-16 21:29:11 +09:00
cutls
b9d562d8f0 www.youtube.com 2019-11-16 14:29:06 +09:00
cutls
83bd9499fd TheDesk20.0.3 (Kawaii) 2019-11-16 14:15:45 +09:00
cutls
d3911792ec details 2019-11-16 13:40:35 +09:00
cutls
5c49715298 Around bookmark 2019-11-16 13:36:16 +09:00
cutls
2b3feb40ad Add bookmark TL 2019-11-16 04:58:37 +09:00
cutls
f7dbeaef84 Add dropdown and bookmark 2019-11-16 03:42:23 +09:00
cutls
31472e3206 gitignore 2019-11-16 00:02:03 +09:00
cutls
2e88a8e0c3 Add: Japanese(Kansai) locale 2019-11-16 00:01:54 +09:00
cutls
224d762bc6 Add twitcasting 2019-11-14 02:48:49 +09:00
cutls
2fa1299391 To improve and secure cards... 2019-11-14 02:42:06 +09:00
cutls
dad459694c Merge branch 'master' of github.com:cutls/TheDesk 2019-11-14 01:42:20 +09:00
cutls
c2fa24c956 Fix: thread 2019-11-14 01:42:09 +09:00
dependabot-preview[bot]
e55ea3bd0c Bump electron-builder from 21.2.0 to 22.1.0 in /app (#154)
Bumps [electron-builder](https://github.com/electron-userland/electron-builder) from 21.2.0 to 22.1.0.
- [Release notes](https://github.com/electron-userland/electron-builder/releases)
- [Changelog](https://github.com/electron-userland/electron-builder/blob/master/CHANGELOG.md)
- [Commits](https://github.com/electron-userland/electron-builder/compare/v21.2.0...v22.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-14 00:53:45 +09:00
dependabot-preview[bot]
ae9e6c4a56 Bump chokidar from 3.2.3 to 3.3.0 in /app (#157)
Bumps [chokidar](https://github.com/paulmillr/chokidar) from 3.2.3 to 3.3.0.
- [Release notes](https://github.com/paulmillr/chokidar/releases)
- [Commits](https://github.com/paulmillr/chokidar/compare/3.2.3...3.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-14 00:53:31 +09:00
dependabot-preview[bot]
2a5bb034ab Bump materialize-css from 2387ea3 to e3eb698 in /app (#169)
Bumps [materialize-css](https://github.com/cutls/materialize) from `2387ea3` to `e3eb698`.
- [Release notes](https://github.com/cutls/materialize/releases)
- [Commits](2387ea3897...e3eb698a07)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-14 00:52:42 +09:00
dependabot-preview[bot]
49f190a471 Bump sweetalert2 from 8.18.6 to 9.3.4 in /app (#170)
Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 8.18.6 to 9.3.4.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v8.18.6...v9.3.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-14 00:52:19 +09:00
Cutls
3f5a870877 New Crowdin translations (#167)
* New translations index.json (Russian)

* New translations index.json (Romanian)

* New translations index.json (Portuguese, Brazilian)

* New translations index.json (Portuguese)

* New translations index.json (Polish)

* New translations index.json (Norwegian)

* New translations index.json (Serbian (Cyrillic))

* New translations index.json (Italian)

* New translations index.json (Vietnamese)

* New translations index.json (Ukrainian)

* New translations index.json (Turkish)

* New translations index.json (Swedish)

* New translations index.json (Spanish)

* New translations index.json (Afrikaans)

* New translations index.json (Chinese Traditional)

* New translations index.json (Danish)

* New translations index.json (Catalan)

* New translations index.json (Arabic)

* New translations index.json (Hungarian)

* New translations index.json (Hebrew)

* New translations index.json (Greek)

* New translations index.json (French)

* New translations index.json (Finnish)

* New translations index.json (Dutch)

* New translations acct.json (German)

* New translations index.json (German)

* New translations index.json (German)

* New translations index.json (German)

* New translations index.json (German)
2019-11-14 00:51:39 +09:00
cutls
fd3cf1eb9f TheDesk 20.0.2 (Kawaii) 2019-11-12 00:59:07 +09:00
cutls
9a49979dcb Reconnecting overflow 2019-11-12 00:55:32 +09:00
cutls
6a11099b50 Error on en setting 2019-11-12 00:55:21 +09:00
cutls
5c5c57739a Copy the URL 2019-11-12 00:16:48 +09:00
cutls
8e663391b9 For grapheme cluster compt 2019-11-11 01:20:51 +09:00
cutls
85ccbd1382 For emoji counting 2019-11-11 01:06:46 +09:00
cutls
542ee57f93 Fix: the account color pref. is sometimes losted 2019-11-10 20:37:13 +09:00
cutls
f3fa854074 fix 2019-11-09 14:40:46 +09:00
cutls
714feca455 TheDesk 20.0.1 (Kawaii) 2019-11-09 14:38:43 +09:00
cutls
f0db66d8d8 Merge branch 'master' of github.com:cutls/TheDesk 2019-11-09 14:30:42 +09:00
cutls
cd74236462 test itunes 2019-11-09 14:30:28 +09:00
cutls
955c95e8a8 Fix: spotift tips 2019-11-09 14:19:18 +09:00
Cutls
ebdacc013a New Crowdin translations (#163)
* New translations acct.json (Bulgarian)

* New translations index.json (Bulgarian)

* New translations main.json (Bulgarian)

* New translations index.json (Bulgarian)

* New translations setting.json (Russian)

* New translations main.json (Russian)

* New translations setting.json (Romanian)

* New translations main.json (Romanian)

* New translations setting.json (Portuguese, Brazilian)

* New translations main.json (Portuguese, Brazilian)

* New translations setting.json (Portuguese)

* New translations main.json (Serbian (Cyrillic))

* New translations main.json (Portuguese)

* New translations setting.json (Polish)

* New translations main.json (Polish)

* New translations setting.json (Norwegian)

* New translations main.json (Norwegian)

* New translations setting.json (Italian)

* New translations setting.json (Serbian (Cyrillic))

* New translations main.json (Turkish)

* New translations main.json (English)

* New translations setting.json (Vietnamese)

* New translations main.json (Vietnamese)

* New translations setting.json (Ukrainian)

* New translations main.json (Ukrainian)

* New translations setting.json (Turkish)

* New translations setting.json (Swedish)

* New translations main.json (Swedish)

* New translations setting.json (Spanish, Argentina)

* New translations main.json (Spanish, Argentina)

* New translations setting.json (Spanish)

* New translations main.json (Spanish)

* New translations main.json (Italian)

* New translations setting.json (Catalan)

* New translations setting.json (Czech)

* New translations main.json (Czech)

* New translations setting.json (Chinese Traditional)

* New translations main.json (Chinese Traditional)

* New translations setting.json (Chinese Simplified)

* New translations main.json (Chinese Simplified)

* New translations main.json (Catalan)

* New translations setting.json (Bulgarian)

* New translations main.json (Bulgarian)

* New translations setting.json (Arabic)

* New translations main.json (Arabic)

* New translations setting.json (Afrikaans)

* New translations main.json (Afrikaans)

* New translations main.json (Danish)

* New translations setting.json (Hungarian)

* New translations main.json (German)

* New translations main.json (Hungarian)

* New translations setting.json (Hebrew)

* New translations main.json (Hebrew)

* New translations setting.json (Greek)

* New translations main.json (Greek)

* New translations setting.json (German)

* New translations setting.json (Danish)

* New translations setting.json (French)

* New translations main.json (French)

* New translations setting.json (Finnish)

* New translations main.json (Finnish)

* New translations setting.json (Dutch)

* New translations main.json (Dutch)

* New translations setting.json (English)
2019-11-09 11:15:15 +09:00
cutls
d08c2ecd74 TheDesk 20.0.0 (Kawaii) 2019-11-09 02:24:42 +09:00
cutls
ef9b851309 Fix: Improve: Integrated TL 2019-11-09 02:05:15 +09:00
cutls
083139efa7 fix 2019-11-09 00:15:03 +09:00
cutls
bd11f7da50 Add: get images from remote 2019-11-09 00:09:39 +09:00
cutls
472e9268a1 #162 minor 2019-11-08 23:49:36 +09:00
cutls
e6ce764084 #162 image viewer 2019-11-08 23:46:12 +09:00
cutls
b8fcd11a62 wip 2019-11-08 22:53:52 +09:00
cutls
f35232cc52 Coding style 2019-11-08 22:52:54 +09:00
cutls
615b89be3a Merge branch 'master' of github.com:cutls/TheDesk 2019-11-04 01:10:19 +09:00
cutls
ffa4ecd673 Add: JSON parse miss error-log 2019-11-04 01:10:06 +09:00
cutls
5dfb28f2de Fix: emoji parette 2019-11-04 01:09:43 +09:00
cutls
25d24ddef0 Fix: follow on cross-acct 2019-11-04 01:09:02 +09:00
Cutls
dcc9aba4a8 New Crowdin translations (#153)
* New translations index.json (Russian)

* New translations index.json (Romanian)

* New translations index.json (Portuguese, Brazilian)

* New translations index.json (Portuguese)

* New translations index.json (Polish)

* New translations index.json (Norwegian)

* New translations index.json (Serbian (Cyrillic))

* New translations index.json (Afrikaans)

* New translations index.json (Vietnamese)

* New translations index.json (Ukrainian)

* New translations index.json (Turkish)

* New translations index.json (Swedish)

* New translations index.json (Spanish, Argentina)

* New translations index.json (Spanish)

* New translations index.json (Italian)

* New translations index.json (Czech)

* New translations index.json (Chinese Traditional)

* New translations index.json (Chinese Simplified)

* New translations index.json (Catalan)

* New translations index.json (Bulgarian)

* New translations index.json (Arabic)

* New translations index.json (Danish)

* New translations index.json (Hungarian)

* New translations index.json (Hebrew)

* New translations index.json (Greek)

* New translations index.json (German)

* New translations index.json (French)

* New translations index.json (Finnish)

* New translations index.json (Dutch)

* New translations index.json (English)
2019-11-03 20:27:25 +09:00
cutls
9977c009e0 Add: log viewer 2019-10-31 01:00:06 +09:00
cutls
2fd45f9e31 Merge branch 'master' of github.com:cutls/TheDesk 2019-10-31 00:30:38 +09:00
cutls
4f7eb88a13 Add: logger 2019-10-31 00:30:26 +09:00
dependabot-preview[bot]
1455f04261 Bump chokidar from 3.2.2 to 3.2.3 in /app (#152)
Bumps [chokidar](https://github.com/paulmillr/chokidar) from 3.2.2 to 3.2.3.
- [Release notes](https://github.com/paulmillr/chokidar/releases)
- [Commits](https://github.com/paulmillr/chokidar/compare/3.2.2...3.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-30 01:15:21 +09:00
cutls
9f9e4d6d6e travis 2019-10-27 11:59:24 +09:00
cutls
3ab45a57e1 travis 2019-10-27 11:55:36 +09:00
cutls
3d5485072c travis 2019-10-27 11:52:50 +09:00
cutls
8c2083955f TheDesk Usamin (18.11.4) 2019-10-27 11:43:58 +09:00
Cutls
450c6a758f New Crowdin translations (#150)
* New translations update.json (Hebrew)

* New translations update.json (Italian)

* New translations setting.json (Italian)

* New translations update.json (Hungarian)

* New translations setting.json (Hungarian)

* New translations setting.json (Hebrew)

* New translations update.json (Greek)

* New translations setting.json (Greek)

* New translations update.json (German)

* New translations setting.json (German)

* New translations update.json (Romanian)

* New translations setting.json (Romanian)

* New translations update.json (Portuguese, Brazilian)

* New translations setting.json (Portuguese, Brazilian)

* New translations setting.json (Norwegian)

* New translations update.json (Portuguese)

* New translations setting.json (Portuguese)

* New translations update.json (Polish)

* New translations setting.json (Polish)

* New translations update.json (Norwegian)

* New translations update.json (French)

* New translations update.json (Bulgarian)

* New translations update.json (Chinese Simplified)

* New translations setting.json (Chinese Simplified)

* New translations update.json (Catalan)

* New translations setting.json (Catalan)

* New translations setting.json (Bulgarian)

* New translations update.json (Arabic)

* New translations setting.json (Arabic)

* New translations setting.json (French)

* New translations update.json (Afrikaans)

* New translations setting.json (Afrikaans)

* New translations setting.json (Chinese Traditional)

* New translations update.json (Finnish)

* New translations setting.json (Finnish)

* New translations update.json (Dutch)

* New translations setting.json (Dutch)

* New translations setting.json (Czech)

* New translations update.json (Danish)

* New translations update.json (Czech)

* New translations setting.json (Danish)

* New translations update.json (Chinese Traditional)

* New translations update.json (Ukrainian)

* New translations setting.json (Turkish)

* New translations update.json (Turkish)

* New translations setting.json (Ukrainian)

* New translations update.json (Vietnamese)

* New translations setting.json (Vietnamese)

* New translations setting.json (English)

* New translations update.json (Swedish)

* New translations setting.json (Swedish)

* New translations setting.json (Russian)

* New translations update.json (Russian)

* New translations setting.json (Serbian (Cyrillic))

* New translations update.json (Serbian (Cyrillic))

* New translations setting.json (Spanish)

* New translations update.json (Spanish)

* New translations setting.json (Spanish, Argentina)

* New translations update.json (Spanish, Argentina)

* New translations update.json (English)
2019-10-26 02:17:28 +09:00
dependabot-preview[bot]
24f3e1e758 Bump sweetalert2 from 8.18.5 to 8.18.6 in /app (#149)
Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 8.18.5 to 8.18.6.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v8.18.5...v8.18.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-26 02:16:48 +09:00
cutls
b9103abe96 Merge branch 'master' of github.com:cutls/TheDesk 2019-10-26 02:15:58 +09:00
cutls
a7f8793454 Improve: speed on setting load 2019-10-26 02:14:32 +09:00
cutls
7b28981e9c JP alert dialog 2019-10-26 02:13:37 +09:00
cutls
ca41ca955c JP alert dialog 2019-10-26 02:13:13 +09:00
cutls
dd086e62cb Fix: follow text 2019-10-26 01:21:25 +09:00
cutls
3e2d40d248 WIP: useragent 2019-10-26 01:16:33 +09:00
cutls
bb08ec2435 improve: update 2019-10-25 00:04:53 +09:00
Cutls
0677c24887 New Crowdin translations (#147)
* New translations acct.json (Afrikaans)

* New translations acct.json (Portuguese, Brazilian)

* New translations acct.json (Serbian (Cyrillic))

* New translations main.json (Russian)

* New translations acct.json (Russian)

* New translations main.json (Romanian)

* New translations acct.json (Romanian)

* New translations main.json (Portuguese, Brazilian)

* New translations main.json (Serbian (Cyrillic))

* New translations main.json (Portuguese)

* New translations acct.json (Portuguese)

* New translations main.json (Polish)

* New translations acct.json (Polish)

* New translations main.json (Norwegian)

* New translations acct.json (Norwegian)

* New translations main.json (Turkish)

* New translations acct.json (English)

* New translations main.json (Vietnamese)

* New translations acct.json (Vietnamese)

* New translations main.json (Ukrainian)

* New translations acct.json (Ukrainian)

* New translations acct.json (Spanish)

* New translations acct.json (Turkish)

* New translations main.json (Swedish)

* New translations acct.json (Swedish)

* New translations acct.json (Spanish, Argentina)

* New translations main.json (Spanish)

* New translations main.json (Italian)

* New translations acct.json (Italian)

* New translations acct.json (Czech)

* New translations main.json (Chinese Traditional)

* New translations acct.json (Chinese Traditional)

* New translations acct.json (Chinese Simplified)

* New translations main.json (Catalan)

* New translations acct.json (Catalan)

* New translations acct.json (Bulgarian)

* New translations main.json (Arabic)

* New translations acct.json (Arabic)

* New translations main.json (Afrikaans)

* New translations acct.json (Danish)

* New translations main.json (Danish)

* New translations main.json (Hungarian)

* New translations acct.json (Hungarian)

* New translations main.json (Hebrew)

* New translations acct.json (Hebrew)

* New translations main.json (Greek)

* New translations acct.json (Greek)

* New translations acct.json (German)

* New translations main.json (French)

* New translations acct.json (French)

* New translations main.json (Finnish)

* New translations acct.json (Finnish)

* New translations main.json (Dutch)

* New translations acct.json (Dutch)
2019-10-23 21:40:29 +09:00
cutls
29277236ca travis upd 2019-10-22 15:17:48 +09:00
cutls
7579957fdf fix 2019-10-22 14:53:08 +09:00
cutls
257d0d313d TheDesk Usamin (18.11.3) 2019-10-22 14:52:03 +09:00
cutls
4b970ef770 Merge branch 'master' of github.com:cutls/TheDesk 2019-10-22 14:42:47 +09:00
Cutls
6ec35e37ab New Crowdin translations (#146)
* New translations main.json (Norwegian)

* New translations main.json (Vietnamese)

* New translations main.json (Ukrainian)

* New translations main.json (Turkish)

* New translations main.json (Swedish)

* New translations main.json (Spanish, Argentina)

* New translations main.json (Spanish)

* New translations main.json (Serbian (Cyrillic))

* New translations main.json (Russian)

* New translations main.json (Romanian)

* New translations main.json (Portuguese, Brazilian)

* New translations main.json (Portuguese)

* New translations main.json (Polish)

* New translations main.json (Italian)

* New translations main.json (Hungarian)

* New translations main.json (Hebrew)

* New translations main.json (Greek)

* New translations main.json (German)

* New translations main.json (French)

* New translations main.json (Finnish)

* New translations main.json (Dutch)

* New translations main.json (Danish)

* New translations main.json (Czech)

* New translations main.json (Chinese Traditional)

* New translations main.json (Chinese Simplified)

* New translations main.json (Catalan)

* New translations main.json (English)

* New translations main.json (Arabic)

* New translations main.json (Bulgarian)

* New translations main.json (Afrikaans)

* New translations setting.json (Afrikaans)

* New translations setting.json (Arabic)

* New translations setting.json (Norwegian)

* New translations setting.json (Vietnamese)

* New translations setting.json (Ukrainian)

* New translations setting.json (Turkish)

* New translations setting.json (Swedish)

* New translations setting.json (Spanish, Argentina)

* New translations setting.json (Spanish)

* New translations setting.json (Serbian (Cyrillic))

* New translations setting.json (Russian)

* New translations setting.json (Romanian)

* New translations setting.json (Portuguese, Brazilian)

* New translations setting.json (Portuguese)

* New translations setting.json (Polish)

* New translations setting.json (Italian)

* New translations setting.json (Bulgarian)

* New translations setting.json (Hungarian)

* New translations setting.json (Hebrew)

* New translations setting.json (Greek)

* New translations setting.json (German)

* New translations setting.json (French)

* New translations setting.json (Finnish)

* New translations setting.json (Dutch)

* New translations setting.json (Danish)

* New translations setting.json (Czech)

* New translations setting.json (Chinese Traditional)

* New translations setting.json (Chinese Simplified)

* New translations setting.json (Catalan)

* New translations setting.json (English)

* New translations setting.json (Romanian)

* New translations setting.json (Portuguese, Brazilian)

* New translations setting.json (Russian)

* New translations setting.json (Italian)

* New translations setting.json (Norwegian)

* New translations setting.json (Portuguese)

* New translations setting.json (Polish)

* New translations setting.json (Serbian (Cyrillic))

* New translations setting.json (Ukrainian)

* New translations setting.json (Vietnamese)

* New translations setting.json (Turkish)

* New translations setting.json (Spanish)

* New translations setting.json (Spanish, Argentina)

* New translations setting.json (Swedish)

* New translations main.json (Chinese Simplified)

* New translations setting.json (Chinese Simplified)

* New translations setting.json (Chinese Traditional)

* New translations setting.json (Czech)

* New translations setting.json (Catalan)

* New translations setting.json (Arabic)

* New translations setting.json (Afrikaans)

* New translations index.json (Bulgarian)

* New translations main.json (Bulgarian)

* New translations setting.json (Bulgarian)

* New translations setting.json (Danish)

* New translations setting.json (Greek)

* New translations setting.json (Hebrew)

* New translations setting.json (Hungarian)

* New translations setting.json (German)

* New translations index.json (German)

* New translations setting.json (Dutch)

* New translations setting.json (Finnish)

* New translations index.json (French)

* New translations main.json (French)

* New translations setting.json (French)

* New translations main.json (Spanish, Argentina)
2019-10-22 14:42:05 +09:00
cutls
72f461f0d2 Merge branch 'master' of github.com:cutls/TheDesk 2019-10-22 14:37:04 +09:00
cutls
32c7f52882 Fix: post-box 2019-10-22 14:34:30 +09:00
cutls
4943b3ad20 Add: login by access-token 2019-10-22 14:34:23 +09:00
cutls
7eccc04e98 ksc 2019-10-22 00:18:55 +09:00
Cutls
88e65c36bf Update crowdin.yml 2019-10-21 08:12:16 +09:00
cutls
5e13d86778 Add: keyshortcut to search 2019-10-20 20:57:22 +09:00
Cutls
0e89f8bc4d Merge pull request #144 from cutls/dependabot/npm_and_yarn/app/sweetalert2-8.18.5
Bump sweetalert2 from 8.18.4 to 8.18.5 in /app
2019-10-20 20:05:13 +09:00
Cutls
a9a57822ef Merge branch 'master' into dependabot/npm_and_yarn/app/sweetalert2-8.18.5 2019-10-20 20:05:06 +09:00
Cutls
df25b4e609 Merge pull request #145 from cutls/l10n_master
New Crowdin translations
2019-10-20 20:04:38 +09:00
cutls
b3ca402842 About update-check #141 2019-10-20 20:04:00 +09:00
Cutls
a52d7aee73 New translations setting.json (Spanish, Argentina) 2019-10-20 19:53:44 +09:00
Cutls
7214ff001a New translations setting.json (Spanish, Argentina) 2019-10-20 19:42:52 +09:00
Cutls
0e731c3e8a New translations main.json (Spanish, Argentina) 2019-10-20 19:42:51 +09:00
cutls
4f858cf7d6 Watch mode(not auto-reloaded) 2019-10-20 19:36:44 +09:00
cutls
3e5f9c51f5 Fix #142 2019-10-20 19:09:52 +09:00
cutls
8784cae01c Fix: mouseover 2019-10-20 13:27:19 +09:00
cutls
81a3da550f Fix: instance ticker 2019-10-20 13:13:59 +09:00
cutls
7fc06d0750 Merge branch 'master' of github.com:cutls/TheDesk 2019-10-20 13:11:15 +09:00
cutls
1e0ebe9b7f Improve: profile 2019-10-20 13:11:03 +09:00
dependabot-preview[bot]
73b7abd894 Bump sweetalert2 from 8.18.4 to 8.18.5 in /app
Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 8.18.4 to 8.18.5.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v8.18.4...v8.18.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-18 20:15:02 +00:00
Cutls
132f7253f6 Merge pull request #143 from cutls/dependabot/npm_and_yarn/app/sweetalert2-8.18.4
Bump sweetalert2 from 8.18.3 to 8.18.4 in /app
2019-10-17 23:04:49 +09:00
dependabot-preview[bot]
827d581f1a Bump sweetalert2 from 8.18.3 to 8.18.4 in /app
Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 8.18.3 to 8.18.4.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v8.18.3...v8.18.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-17 05:33:22 +00:00
cutls
9a315c241c about #141 clipboard 2019-10-14 00:52:33 +09:00
cutls
5f9ddd969e about #141 themes toast shows undifined 2019-10-14 00:44:12 +09:00
cutls
cacf7f9920 about #141 layout menu theme color 2019-10-14 00:38:33 +09:00
cutls
d642729158 Mastodon 3.0.1 compat 2019-10-14 00:28:58 +09:00
cutls
6b339b636a Pixelfed compat 2019-10-14 00:28:44 +09:00
cutls
85468761d3 Improve: nano 2019-10-14 00:28:10 +09:00
cutls
4cabeb2e99 about #141 2019-10-14 00:20:34 +09:00
Cutls
f7d89b7659 Merge pull request #139 from cutls/l10n_master
New Crowdin translations
2019-10-12 11:08:58 +09:00
Cutls
6b5c527a3e Merge pull request #140 from cutls/dependabot/npm_and_yarn/app/itunes-nowplaying-mac-0.3.1
Bump itunes-nowplaying-mac from 0.2.3 to 0.3.1 in /app
2019-10-12 11:08:16 +09:00
dependabot-preview[bot]
57cbab10ac Bump itunes-nowplaying-mac from 0.2.3 to 0.3.1 in /app
Bumps [itunes-nowplaying-mac](https://github.com/rinsuki/itunes-nowplaying-mac) from 0.2.3 to 0.3.1.
- [Release notes](https://github.com/rinsuki/itunes-nowplaying-mac/releases)
- [Commits](https://github.com/rinsuki/itunes-nowplaying-mac/commits/0.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-12 01:49:46 +00:00
cutls
f50c2d3049 fix np on macos 2019-10-12 01:33:40 +09:00
cutls
9957bd9b8a fix np on macos 2019-10-12 01:31:15 +09:00
cutls
e6767dc3f9 fix np on macos 2019-10-12 01:29:16 +09:00
cutls
136935d4f9 fix macOS np 2019-10-12 01:11:29 +09:00
cutls
d654b63bca Fix: macOS NP 2019-10-12 01:08:33 +09:00
cutls
3ba4dee8a7 TheDesk Usamin (18.11.2) 2019-10-12 00:46:52 +09:00
Cutls
d4e0a50dbb New translations main.json (Afrikaans) 2019-10-12 00:27:17 +09:00
Cutls
3d4e35d942 New translations main.json (Bulgarian) 2019-10-12 00:27:16 +09:00
Cutls
5dcdbcdb53 New translations main.json (Arabic) 2019-10-12 00:26:37 +09:00
Cutls
d3a6ad1105 New translations main.json (English) 2019-10-12 00:26:34 +09:00
Cutls
f233ca3284 New translations main.json (Catalan) 2019-10-12 00:26:33 +09:00
Cutls
f4914d9461 New translations main.json (Chinese Simplified) 2019-10-12 00:26:31 +09:00
Cutls
433aac37da New translations main.json (Chinese Traditional) 2019-10-12 00:26:29 +09:00
Cutls
fa34f5483e New translations main.json (Czech) 2019-10-12 00:26:25 +09:00
Cutls
defa748497 New translations main.json (Danish) 2019-10-12 00:26:23 +09:00
Cutls
c70b78d0c7 New translations main.json (Dutch) 2019-10-12 00:26:22 +09:00
Cutls
570b0c3e6a New translations main.json (Finnish) 2019-10-12 00:26:17 +09:00
Cutls
62a8d9b0f6 New translations main.json (French) 2019-10-12 00:26:13 +09:00
Cutls
97e1e4ce53 New translations main.json (German) 2019-10-12 00:26:11 +09:00
Cutls
b5655b530f New translations main.json (Greek) 2019-10-12 00:26:09 +09:00
Cutls
b2c2530a1a New translations main.json (Hebrew) 2019-10-12 00:26:08 +09:00
Cutls
c0a1139773 New translations main.json (Hungarian) 2019-10-12 00:26:06 +09:00
Cutls
e452f8e006 New translations main.json (Italian) 2019-10-12 00:26:03 +09:00
Cutls
7de625e004 New translations main.json (Polish) 2019-10-12 00:26:00 +09:00
Cutls
8106296f6c New translations main.json (Portuguese) 2019-10-12 00:25:58 +09:00
Cutls
7df901756f New translations main.json (Portuguese, Brazilian) 2019-10-12 00:25:57 +09:00
Cutls
b41984e153 New translations main.json (Romanian) 2019-10-12 00:25:53 +09:00
Cutls
376c7f2545 New translations main.json (Russian) 2019-10-12 00:25:52 +09:00
Cutls
d5df64f949 New translations main.json (Serbian (Cyrillic)) 2019-10-12 00:25:51 +09:00
Cutls
c9b2a66114 New translations main.json (Spanish) 2019-10-12 00:25:49 +09:00
Cutls
530917b85e New translations main.json (Spanish, Argentina) 2019-10-12 00:25:47 +09:00
Cutls
b118e61741 New translations main.json (Swedish) 2019-10-12 00:25:46 +09:00
Cutls
635df4dd09 New translations main.json (Turkish) 2019-10-12 00:25:44 +09:00
Cutls
dccdc6290e New translations main.json (Ukrainian) 2019-10-12 00:25:42 +09:00
Cutls
573c461aa2 New translations main.json (Vietnamese) 2019-10-12 00:25:40 +09:00
Cutls
5a76eb28bf New translations main.json (Norwegian) 2019-10-12 00:25:38 +09:00
cutls
48028a8e09 Add: description of images 2019-10-12 00:18:43 +09:00
cutls
1917531c54 cannot fav and bt 2019-10-11 23:50:25 +09:00
Cutls
a9d2bc08b7 New translations setting.json (English) 2019-10-11 22:23:57 +09:00
Cutls
e4ddd6ad8c New translations setting.json (Catalan) 2019-10-11 22:23:27 +09:00
Cutls
aaf318de03 New translations setting.json (Chinese Simplified) 2019-10-11 22:23:26 +09:00
Cutls
3c80cc0670 New translations setting.json (Chinese Traditional) 2019-10-11 22:23:24 +09:00
Cutls
a01d89db30 New translations setting.json (Czech) 2019-10-11 22:23:22 +09:00
Cutls
26090084ff New translations setting.json (Danish) 2019-10-11 22:23:21 +09:00
Cutls
ab0ce56033 New translations setting.json (Dutch) 2019-10-11 22:23:19 +09:00
Cutls
527854bbed New translations setting.json (Finnish) 2019-10-11 22:23:17 +09:00
Cutls
f9de846ad5 New translations setting.json (French) 2019-10-11 22:23:16 +09:00
Cutls
57fbb15685 New translations setting.json (German) 2019-10-11 22:23:14 +09:00
Cutls
8986107256 New translations setting.json (Greek) 2019-10-11 22:23:12 +09:00
Cutls
2326d409a4 New translations setting.json (Hebrew) 2019-10-11 22:23:10 +09:00
Cutls
bcbccd5cb1 New translations setting.json (Hungarian) 2019-10-11 22:23:09 +09:00
Cutls
d47373e3b5 New translations setting.json (Bulgarian) 2019-10-11 22:23:08 +09:00
Cutls
9ffcfa7f41 New translations setting.json (Italian) 2019-10-11 22:23:06 +09:00
Cutls
9a7ff92b5b New translations setting.json (Polish) 2019-10-11 22:23:05 +09:00
Cutls
a53f2ace64 New translations setting.json (Portuguese) 2019-10-11 22:23:02 +09:00
Cutls
280f6c4c9a New translations setting.json (Portuguese, Brazilian) 2019-10-11 22:23:01 +09:00
Cutls
cc33e8fa1b New translations setting.json (Romanian) 2019-10-11 22:22:59 +09:00
Cutls
52b649b1c4 New translations setting.json (Russian) 2019-10-11 22:22:58 +09:00
Cutls
4194412540 New translations setting.json (Serbian (Cyrillic)) 2019-10-11 22:22:56 +09:00
Cutls
9f2f0e29be New translations setting.json (Spanish) 2019-10-11 22:22:54 +09:00
Cutls
e43107ccf7 New translations setting.json (Spanish, Argentina) 2019-10-11 22:22:53 +09:00
Cutls
c2ebadd87a New translations setting.json (Swedish) 2019-10-11 22:22:51 +09:00
Cutls
3521e7b0e7 New translations setting.json (Turkish) 2019-10-11 22:22:50 +09:00
Cutls
9d0aad933e New translations setting.json (Ukrainian) 2019-10-11 22:22:49 +09:00
Cutls
3bd3df8fb2 New translations setting.json (Vietnamese) 2019-10-11 22:22:47 +09:00
Cutls
71e1f5ae9d New translations setting.json (Norwegian) 2019-10-11 22:22:45 +09:00
Cutls
36c3d354cd New translations setting.json (Arabic) 2019-10-11 22:22:42 +09:00
Cutls
9f0af1ba86 New translations setting.json (Afrikaans) 2019-10-11 22:22:26 +09:00
cutls
f74e2262dc Fix en not showing settings menu 2019-10-11 22:04:28 +09:00
cutls
2971144d7f Fix fav and bt errors 2019-10-11 22:04:14 +09:00
cutls
2e2723427b Fix travis error 2019-10-11 00:46:59 +09:00
cutls
ee6127ffcc Fix: travis error 2019-10-11 00:42:01 +09:00
cutls
dcd6fa6958 Add: release note 2019-10-11 00:22:41 +09:00
cutls
7442216962 TheDesk Usamin (18.11.1) 2019-10-11 00:04:31 +09:00
cutls
bb0c781daa Merge branch 'master' of github.com:cutls/TheDesk 2019-10-11 00:00:08 +09:00
cutls
56e5a5ac53 #135 package update 2019-10-10 23:59:57 +09:00
Cutls
419fa4906d Merge pull request #136 from cutls/dependabot/npm_and_yarn/app/electron-6.0.12
Bump electron from 6.0.11 to 6.0.12 in /app
2019-10-10 23:59:27 +09:00
Cutls
16e7617b1e Merge pull request #138 from cutls/dependabot/npm_and_yarn/app/sweetalert2-8.18.3
Bump sweetalert2 from 8.18.0 to 8.18.3 in /app
2019-10-10 23:59:05 +09:00
dependabot-preview[bot]
2ca5798f89 Bump sweetalert2 from 8.18.0 to 8.18.3 in /app
Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 8.18.0 to 8.18.3.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v8.18.0...v8.18.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-10 02:41:08 +00:00
cutls
a08ddc1b8c Merge branch 'master' of github.com:cutls/TheDesk 2019-10-09 23:05:32 +09:00
cutls
83153e2777 Merge branch 'l10n_master' of github.com:cutls/TheDesk 2019-10-09 23:02:40 +09:00
cutls
5b72b93248 Add: custom advanced theme 2019-10-09 23:00:46 +09:00
cutls
c7d911451c Fix error of non display_name acct 2019-10-09 23:00:25 +09:00
Cutls
c400cc317d Merge pull request #137 from kPherox/macos-quit-window-all-closed
Change to quit when window all closed in macOS
2019-10-09 15:22:21 +09:00
dependabot-preview[bot]
50784c9958 Bump electron from 6.0.11 to 6.0.12 in /app
Bumps [electron](https://github.com/electron/electron) from 6.0.11 to 6.0.12.
- [Release notes](https://github.com/electron/electron/releases)
- [Commits](https://github.com/electron/electron/compare/v6.0.11...v6.0.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-09 02:32:39 +00:00
cutls
c4a5d406c7 Add Custom Themes scheme 2019-10-09 01:14:27 +09:00
kPherox
d933eef8cc Change to quit when window all closed in macOS 2019-10-08 23:51:50 +09:00
cutls
ce84069429 WIP Fix #131 2019-10-08 23:46:59 +09:00
cutls
8140e56cbc Notification on Windows(can use render-process-based notification) 2019-10-08 23:26:21 +09:00
cutls
de40e0e22a Fix #132 2019-10-08 23:25:44 +09:00
cutls
44ccd111b2 Fix error on Linux 2019-10-08 22:04:51 +09:00
Cutls
7ac0889b78 Add some version 2019-10-05 22:48:21 +09:00
Cutls
c4a5996b21 New translations main.json (Spanish, Argentina) 2019-10-05 14:13:03 +09:00
Cutls
9eaca7bcb2 New translations index.json (Spanish, Argentina) 2019-10-05 14:13:01 +09:00
Cutls
90629aecb4 Add: always sensitive on 2019-10-05 03:51:05 +09:00
Cutls
cb6a75de3b Fix: lang selector 2019-10-05 03:50:49 +09:00
Cutls
9bb066596c fix version sys 2019-10-05 02:51:58 +09:00
Cutls
a0b6610b7d 18.11.0 2019-10-05 02:48:06 +09:00
Cutls
c4e06f90f8 Merge branch 'master' of https://github.com/cutls/TheDesk 2019-10-05 02:44:57 +09:00
Cutls
60a525f0b8 Merge pull request #124 from cutls/dependabot/npm_and_yarn/app/sweetalert2-8.18.0
Bump sweetalert2 from 8.17.6 to 8.18.0 in /app
2019-10-05 02:44:47 +09:00
Cutls
fe6067eeed Merge pull request #125 from cutls/dependabot/npm_and_yarn/app/electron-6.0.11
Bump electron from 6.0.10 to 6.0.11 in /app
2019-10-05 02:44:40 +09:00
Cutls
f72294e2b9 Merge pull request #126 from cutls/dependabot/npm_and_yarn/app/json5-2.1.1
Bump json5 from 2.1.0 to 2.1.1 in /app
2019-10-05 02:43:51 +09:00
Cutls
409b98dd39 Merge pull request #129 from cutls/l10n_master
New Crowdin translations
2019-10-05 02:43:00 +09:00
Cutls
0168b882a8 fix some categorized emojis 2019-10-05 02:40:25 +09:00
Cutls
9aa83354bd TheDesk Usamin (18.11.0) 2019-10-05 02:30:32 +09:00
Cutls
e311d82b0a New translations index.json (Bulgarian) 2019-10-05 02:25:40 +09:00
Cutls
531e526d33 New translations index.json (Catalan) 2019-10-05 02:25:38 +09:00
Cutls
a2a6c49ae0 New translations index.json (Chinese Simplified) 2019-10-05 02:25:37 +09:00
Cutls
15ae6d91d9 New translations index.json (Chinese Traditional) 2019-10-05 02:25:36 +09:00
Cutls
f3ba3706ba New translations index.json (Czech) 2019-10-05 02:25:34 +09:00
Cutls
0ab6ea2e26 New translations index.json (Danish) 2019-10-05 02:25:33 +09:00
Cutls
05d17f329f New translations index.json (Dutch) 2019-10-05 02:25:31 +09:00
Cutls
c7e9b67698 New translations index.json (Finnish) 2019-10-05 02:25:29 +09:00
Cutls
f654620816 New translations index.json (French) 2019-10-05 02:25:28 +09:00
Cutls
5bd4885241 New translations index.json (German) 2019-10-05 02:25:27 +09:00
Cutls
91643b06f2 New translations index.json (Greek) 2019-10-05 02:25:26 +09:00
Cutls
d35ec1b7c4 New translations index.json (Hebrew) 2019-10-05 02:25:24 +09:00
Cutls
d2609d11ab New translations index.json (Hungarian) 2019-10-05 02:25:23 +09:00
Cutls
014d3499f0 New translations index.json (Arabic) 2019-10-05 02:25:21 +09:00
Cutls
edd8a412b5 New translations index.json (Italian) 2019-10-05 02:25:20 +09:00
Cutls
7c57eef9f7 New translations index.json (Polish) 2019-10-05 02:25:19 +09:00
Cutls
8df4d5d808 New translations index.json (Portuguese) 2019-10-05 02:25:17 +09:00
Cutls
98b0fd4a4f New translations index.json (Portuguese, Brazilian) 2019-10-05 02:25:16 +09:00
Cutls
3e8c9acb02 New translations index.json (Romanian) 2019-10-05 02:25:15 +09:00
Cutls
d829dd01de New translations index.json (Russian) 2019-10-05 02:25:13 +09:00
Cutls
41803d21c9 New translations index.json (Serbian (Cyrillic)) 2019-10-05 02:25:12 +09:00
Cutls
b58b66178c New translations index.json (Spanish) 2019-10-05 02:25:10 +09:00
Cutls
7c40cf1fb7 New translations index.json (Spanish, Argentina) 2019-10-05 02:25:09 +09:00
Cutls
a923c62dac New translations index.json (Swedish) 2019-10-05 02:25:08 +09:00
Cutls
00d9c91a53 New translations index.json (Turkish) 2019-10-05 02:25:06 +09:00
Cutls
6fa101c699 New translations index.json (Ukrainian) 2019-10-05 02:25:05 +09:00
Cutls
1372833dd8 New translations index.json (Vietnamese) 2019-10-05 02:25:04 +09:00
Cutls
7d57750d73 New translations index.json (Norwegian) 2019-10-05 02:25:02 +09:00
Cutls
28c06706b4 New translations index.json (English) 2019-10-05 02:25:00 +09:00
Cutls
18146d2ef7 New translations index.json (Afrikaans) 2019-10-05 02:24:59 +09:00
Cutls
52c65afce6 Add: boost with visibility 2019-10-05 02:23:47 +09:00
Cutls
8f76c9b09d Fix: close tabs on acct/settings 2019-10-05 01:57:53 +09:00
Cutls
fffc94fbdd Fix transaltions 2019-10-05 01:57:34 +09:00
Cutls
1f398a8b4c Fix translations 2019-10-05 01:41:40 +09:00
Cutls
98f4010cb7 Merge pull request #128 from cutls/l10n_master
New Crowdin translations
2019-10-05 01:40:15 +09:00
Cutls
d34e8940a7 Merge branch 'master' into l10n_master 2019-10-05 01:39:57 +09:00
Cutls
bbf3c33a89 New translations update.json (English) 2019-10-05 01:37:45 +09:00
Cutls
f69fee98df New translations index.json (Spanish) 2019-10-05 01:37:43 +09:00
Cutls
f9b717965f New translations index.json (Serbian (Cyrillic)) 2019-10-05 01:37:42 +09:00
Cutls
01ad439d0a New translations index.json (Russian) 2019-10-05 01:37:41 +09:00
Cutls
29ad8d9dbc New translations index.json (Romanian) 2019-10-05 01:37:40 +09:00
Cutls
6ffad11cba New translations index.json (Portuguese, Brazilian) 2019-10-05 01:37:38 +09:00
Cutls
dc62840299 New translations index.json (Portuguese) 2019-10-05 01:37:37 +09:00
Cutls
ae9c669ca3 New translations index.json (Swedish) 2019-10-05 01:37:36 +09:00
Cutls
cd4b9b3be6 New translations index.json (Polish) 2019-10-05 01:37:35 +09:00
Cutls
e7fc5719e3 New translations index.json (Italian) 2019-10-05 01:37:34 +09:00
Cutls
29350e0782 New translations index.json (Hungarian) 2019-10-05 01:37:33 +09:00
Cutls
2c9821e670 New translations index.json (Hebrew) 2019-10-05 01:37:31 +09:00
Cutls
a61050f8fa New translations index.json (Greek) 2019-10-05 01:37:30 +09:00
Cutls
747d25b439 New translations index.json (German) 2019-10-05 01:37:29 +09:00
Cutls
cafd36b85d New translations index.json (French) 2019-10-05 01:37:27 +09:00
Cutls
d7450d9699 New translations index.json (Norwegian) 2019-10-05 01:37:26 +09:00
Cutls
4224a02d16 New translations index.json (Finnish) 2019-10-05 01:37:25 +09:00
Cutls
82bf21d54b New translations index.json (Turkish) 2019-10-05 01:37:24 +09:00
Cutls
e2672d5d94 New translations index.json (Vietnamese) 2019-10-05 01:37:23 +09:00
Cutls
8d30ccf6fe New translations main.json (Hebrew) 2019-10-05 01:37:21 +09:00
Cutls
be995930a0 New translations main.json (Greek) 2019-10-05 01:37:20 +09:00
Cutls
fbd52c5a85 New translations main.json (German) 2019-10-05 01:37:18 +09:00
Cutls
10e7a7fd27 New translations main.json (French) 2019-10-05 01:37:17 +09:00
Cutls
92a0ec03b1 New translations main.json (Finnish) 2019-10-05 01:37:16 +09:00
Cutls
83a07f7ee4 New translations main.json (Dutch) 2019-10-05 01:37:14 +09:00
Cutls
32628be87b New translations main.json (Danish) 2019-10-05 01:37:13 +09:00
Cutls
102e8964ee New translations index.json (Ukrainian) 2019-10-05 01:37:11 +09:00
Cutls
742ea9f245 New translations main.json (Czech) 2019-10-05 01:37:09 +09:00
Cutls
25f843331c New translations main.json (Chinese Simplified) 2019-10-05 01:37:08 +09:00
Cutls
c6680d1f03 New translations main.json (Catalan) 2019-10-05 01:37:06 +09:00
Cutls
f5279fc91e New translations main.json (Bulgarian) 2019-10-05 01:37:05 +09:00
Cutls
ba50376c85 New translations main.json (Arabic) 2019-10-05 01:37:03 +09:00
Cutls
dd1395f3f4 New translations main.json (Afrikaans) 2019-10-05 01:37:02 +09:00
Cutls
450df2ce6a New translations index.json (English) 2019-10-05 01:37:00 +09:00
Cutls
f9e384a87d New translations main.json (Chinese Traditional) 2019-10-05 01:36:59 +09:00
Cutls
81484b7ae3 New translations main.json (Hungarian) 2019-10-05 01:36:58 +09:00
Cutls
a14809a96a New translations index.json (Dutch) 2019-10-05 01:36:56 +09:00
Cutls
1753b01a1b New translations index.json (Czech) 2019-10-05 01:36:55 +09:00
Cutls
86e7924675 New translations acct.json (Norwegian) 2019-10-05 01:36:53 +09:00
Cutls
e0daa923c6 New translations acct.json (Italian) 2019-10-05 01:36:52 +09:00
Cutls
32c67d5f62 New translations acct.json (Hungarian) 2019-10-05 01:36:51 +09:00
Cutls
7580706bd0 New translations acct.json (Hebrew) 2019-10-05 01:36:50 +09:00
Cutls
68da5085ea New translations acct.json (Greek) 2019-10-05 01:36:49 +09:00
Cutls
55d0c0f66b New translations acct.json (German) 2019-10-05 01:36:48 +09:00
Cutls
5d35d56837 New translations acct.json (French) 2019-10-05 01:36:48 +09:00
Cutls
a9b150960e New translations acct.json (Polish) 2019-10-05 01:36:47 +09:00
Cutls
72a9e81ba1 New translations acct.json (Finnish) 2019-10-05 01:36:46 +09:00
Cutls
0032a51051 New translations acct.json (Danish) 2019-10-05 01:36:45 +09:00
Cutls
faa9102815 New translations acct.json (Czech) 2019-10-05 01:36:44 +09:00
Cutls
525ce59b8b New translations acct.json (Chinese Traditional) 2019-10-05 01:36:43 +09:00
Cutls
00055a9f32 New translations acct.json (Chinese Simplified) 2019-10-05 01:36:42 +09:00
Cutls
3da62e366f New translations acct.json (Catalan) 2019-10-05 01:36:41 +09:00
Cutls
66ba0fe18e New translations acct.json (Bulgarian) 2019-10-05 01:36:40 +09:00
Cutls
cc7a7386be New translations acct.json (Dutch) 2019-10-05 01:36:39 +09:00
Cutls
f1a89f1001 New translations index.json (Danish) 2019-10-05 01:36:38 +09:00
Cutls
83ad5538b0 New translations acct.json (Portuguese) 2019-10-05 01:36:37 +09:00
Cutls
8e1497cf71 New translations acct.json (Romanian) 2019-10-05 01:36:36 +09:00
Cutls
9b4da63b0d New translations index.json (Chinese Traditional) 2019-10-05 01:36:35 +09:00
Cutls
1fad5adbd2 New translations index.json (Chinese Simplified) 2019-10-05 01:36:34 +09:00
Cutls
72497154a7 New translations index.json (Catalan) 2019-10-05 01:36:32 +09:00
Cutls
5dcab4fe9e New translations index.json (Bulgarian) 2019-10-05 01:36:31 +09:00
Cutls
d592f5eb62 New translations index.json (Arabic) 2019-10-05 01:36:29 +09:00
Cutls
d85cbca8ea New translations index.json (Afrikaans) 2019-10-05 01:36:28 +09:00
Cutls
be92ae76d6 New translations acct.json (English) 2019-10-05 01:36:26 +09:00
Cutls
3cfedd4ae9 New translations acct.json (Portuguese, Brazilian) 2019-10-05 01:36:24 +09:00
Cutls
cd88acf337 New translations acct.json (Vietnamese) 2019-10-05 01:36:23 +09:00
Cutls
adf628b3b0 New translations acct.json (Turkish) 2019-10-05 01:36:22 +09:00
Cutls
bbb945283b New translations acct.json (Swedish) 2019-10-05 01:36:21 +09:00
Cutls
10b7691313 New translations acct.json (Spanish) 2019-10-05 01:36:20 +09:00
Cutls
1e93556f8e New translations acct.json (Serbian (Cyrillic)) 2019-10-05 01:36:18 +09:00
Cutls
77bfb852e0 New translations acct.json (Russian) 2019-10-05 01:36:17 +09:00
Cutls
abeb0ad82f New translations acct.json (Ukrainian) 2019-10-05 01:36:16 +09:00
Cutls
722304c4a1 New translations acct.json (Arabic) 2019-10-05 01:36:15 +09:00
Cutls
9e5ea8c052 New translations main.json (Italian) 2019-10-05 01:36:14 +09:00
Cutls
e6dc46a270 New translations main.json (Polish) 2019-10-05 01:36:13 +09:00
Cutls
cf0fffcc3b New translations update.json (Finnish) 2019-10-05 01:36:11 +09:00
Cutls
64835b0de9 New translations update.json (Dutch) 2019-10-05 01:36:10 +09:00
Cutls
ca3ae925d1 New translations update.json (Danish) 2019-10-05 01:36:09 +09:00
Cutls
245e17ed42 New translations update.json (Czech) 2019-10-05 01:36:09 +09:00
Cutls
22605323c1 New translations update.json (Chinese Traditional) 2019-10-05 01:36:08 +09:00
Cutls
ca0e8f93f9 New translations update.json (Chinese Simplified) 2019-10-05 01:36:07 +09:00
Cutls
8f763f9c5c New translations update.json (Catalan) 2019-10-05 01:36:06 +09:00
Cutls
1e8e619762 New translations update.json (French) 2019-10-05 01:36:05 +09:00
Cutls
5d3d5b4c72 New translations update.json (Bulgarian) 2019-10-05 01:36:04 +09:00
Cutls
81029b203e New translations update.json (Afrikaans) 2019-10-05 01:36:03 +09:00
Cutls
1fbfb3970d New translations setting.json (English) 2019-10-05 01:36:02 +09:00
Cutls
aa9e590574 New translations setting.json (Vietnamese) 2019-10-05 01:36:01 +09:00
Cutls
495ef70d41 New translations setting.json (Ukrainian) 2019-10-05 01:35:59 +09:00
Cutls
8d45bf6ee9 New translations setting.json (Turkish) 2019-10-05 01:35:58 +09:00
Cutls
5ea7e397c6 New translations setting.json (Swedish) 2019-10-05 01:35:56 +09:00
Cutls
70af77f06e New translations update.json (Arabic) 2019-10-05 01:35:55 +09:00
Cutls
21da8f0274 New translations update.json (German) 2019-10-05 01:35:53 +09:00
Cutls
9be2b578a2 New translations update.json (Hebrew) 2019-10-05 01:35:52 +09:00
Cutls
bcbc640840 New translations update.json (Vietnamese) 2019-10-05 01:35:51 +09:00
Cutls
a569240444 New translations update.json (Ukrainian) 2019-10-05 01:35:50 +09:00
Cutls
f071b9c4f2 New translations update.json (Turkish) 2019-10-05 01:35:49 +09:00
Cutls
681f116733 New translations update.json (Swedish) 2019-10-05 01:35:48 +09:00
Cutls
b1bfa713e2 New translations update.json (Spanish) 2019-10-05 01:35:47 +09:00
Cutls
8133bf1916 New translations update.json (Serbian (Cyrillic)) 2019-10-05 01:35:46 +09:00
Cutls
7fc61cdad3 New translations update.json (Greek) 2019-10-05 01:35:45 +09:00
Cutls
0f926c96c8 New translations update.json (Russian) 2019-10-05 01:35:44 +09:00
Cutls
557409ea72 New translations update.json (Portuguese, Brazilian) 2019-10-05 01:35:43 +09:00
Cutls
f0a847b135 New translations update.json (Portuguese) 2019-10-05 01:35:42 +09:00
Cutls
5181b271bc New translations update.json (Polish) 2019-10-05 01:35:41 +09:00
Cutls
38fe00fbe0 New translations update.json (Norwegian) 2019-10-05 01:35:40 +09:00
Cutls
be100b24d1 New translations update.json (Italian) 2019-10-05 01:35:39 +09:00
Cutls
0ef338b1e8 New translations update.json (Hungarian) 2019-10-05 01:35:38 +09:00
Cutls
12130f8601 New translations update.json (Romanian) 2019-10-05 01:35:38 +09:00
Cutls
dfe6c9e8e7 New translations main.json (Norwegian) 2019-10-05 01:35:37 +09:00
Cutls
cfd4d18c62 New translations setting.json (Spanish) 2019-10-05 01:35:35 +09:00
Cutls
7ee60c8986 New translations setting.json (Russian) 2019-10-05 01:35:34 +09:00
Cutls
0fee24734d New translations setting.json (Bulgarian) 2019-10-05 01:35:33 +09:00
Cutls
4b7895c3ab New translations setting.json (Arabic) 2019-10-05 01:35:31 +09:00
Cutls
63610a324c New translations setting.json (Afrikaans) 2019-10-05 01:35:30 +09:00
Cutls
7a72daf3ec New translations main.json (English) 2019-10-05 01:35:28 +09:00
Cutls
f33acd67ec New translations main.json (Vietnamese) 2019-10-05 01:35:27 +09:00
Cutls
9a5ac036d6 New translations main.json (Ukrainian) 2019-10-05 01:35:26 +09:00
Cutls
e0d8094268 New translations main.json (Turkish) 2019-10-05 01:35:24 +09:00
Cutls
1d5648f882 New translations setting.json (Catalan) 2019-10-05 01:35:22 +09:00
Cutls
d528093510 New translations main.json (Swedish) 2019-10-05 01:35:21 +09:00
Cutls
738a11d96f New translations main.json (Spanish) 2019-10-05 01:35:19 +09:00
Cutls
01744889fb New translations main.json (Serbian (Cyrillic)) 2019-10-05 01:35:18 +09:00
Cutls
f5c4362f0d New translations main.json (Russian) 2019-10-05 01:35:16 +09:00
Cutls
268dd4d469 New translations main.json (Romanian) 2019-10-05 01:35:15 +09:00
Cutls
41c207af14 New translations main.json (Portuguese, Brazilian) 2019-10-05 01:35:13 +09:00
Cutls
513b7ecd78 New translations main.json (Portuguese) 2019-10-05 01:35:11 +09:00
Cutls
83fb4663f6 New translations main.json (Spanish, Argentina) 2019-10-05 01:35:09 +09:00
Cutls
7e88993b5c New translations setting.json (Serbian (Cyrillic)) 2019-10-05 01:35:08 +09:00
Cutls
6e6b7f37b2 New translations setting.json (Chinese Simplified) 2019-10-05 01:35:06 +09:00
Cutls
a1152446d9 New translations setting.json (Czech) 2019-10-05 01:35:05 +09:00
Cutls
3eab9b30a1 New translations setting.json (Romanian) 2019-10-05 01:35:03 +09:00
Cutls
573587b894 New translations setting.json (Portuguese, Brazilian) 2019-10-05 01:35:02 +09:00
Cutls
adfb395492 New translations setting.json (Portuguese) 2019-10-05 01:35:00 +09:00
Cutls
b4b4f09287 New translations setting.json (Polish) 2019-10-05 01:34:59 +09:00
Cutls
31c80ff07b New translations setting.json (Norwegian) 2019-10-05 01:34:58 +09:00
Cutls
d20e94b422 New translations setting.json (Italian) 2019-10-05 01:34:56 +09:00
Cutls
1e7fefbde9 New translations setting.json (Chinese Traditional) 2019-10-05 01:34:52 +09:00
Cutls
42f68a1109 New translations setting.json (Hungarian) 2019-10-05 01:34:50 +09:00
Cutls
f47c704e29 New translations setting.json (Greek) 2019-10-05 01:34:49 +09:00
Cutls
be3cfd8d2d New translations setting.json (German) 2019-10-05 01:34:48 +09:00
Cutls
d6ded9e64b New translations setting.json (French) 2019-10-05 01:34:47 +09:00
Cutls
6b0704ec76 New translations setting.json (Finnish) 2019-10-05 01:34:45 +09:00
Cutls
a896ae69d0 New translations setting.json (Dutch) 2019-10-05 01:34:44 +09:00
Cutls
9ba4fe2d0f New translations setting.json (Danish) 2019-10-05 01:34:42 +09:00
Cutls
29b904998e New translations setting.json (Hebrew) 2019-10-05 01:34:40 +09:00
Cutls
bf422cb0b2 New translations acct.json (Afrikaans) 2019-10-05 01:34:39 +09:00
Cutls
bf87c3e3f1 Update Crowdin configuration file 2019-10-05 01:33:47 +09:00
Cutls
b96c6bd324 New translations index.json (Spanish, Argentina) 2019-10-05 01:33:47 +09:00
Cutls
0293318b59 New translations main.json (Spanish, Argentina) 2019-10-05 01:33:45 +09:00
Cutls
38588b8204 New translations setting.json (Spanish, Argentina) 2019-10-05 01:33:44 +09:00
Cutls
f2d22e6b7f New translations update.json (Spanish, Argentina) 2019-10-05 01:33:42 +09:00
Cutls
45848306bc New translations index.json (German) 2019-10-05 01:33:31 +09:00
Cutls
b160b25d7d New translations main.json (German) 2019-10-05 01:33:29 +09:00
Cutls
d1e6d533fc New translations setting.json (German) 2019-10-05 01:33:27 +09:00
Cutls
ee168ed5e2 New translations update.json (German) 2019-10-05 01:33:18 +09:00
Cutls
6c8e3d88bd New translations acct.json (German) 2019-10-05 01:32:42 +09:00
Cutls
77b2e416c1 New translations acct.json (Spanish, Argentina) 2019-10-05 01:32:41 +09:00
Cutls
e02eefdc8e New translations acct.json (French) 2019-10-05 01:32:38 +09:00
Cutls
fd4f5ec574 New translations update.json (Bulgarian) 2019-10-05 01:15:22 +09:00
Cutls
b327b38113 New translations setting.json (Bulgarian) 2019-10-05 01:15:21 +09:00
Cutls
76ad662f56 New translations main.json (Bulgarian) 2019-10-05 01:15:19 +09:00
Cutls
4ad3c397b6 New translations index.json (Bulgarian) 2019-10-05 01:15:18 +09:00
Cutls
75d2b46c7a New translations acct.json (Bulgarian) 2019-10-05 01:15:16 +09:00
Cutls
a7659a0c2e New translations update.json (Czech) 2019-10-05 00:44:24 +09:00
Cutls
e3a740f66a New translations main.json (French) 2019-10-05 00:44:23 +09:00
Cutls
af281481d5 New translations setting.json (French) 2019-10-05 00:44:22 +09:00
Cutls
5f6758554d New translations update.json (French) 2019-10-05 00:44:20 +09:00
Cutls
2b2a8c1d2e New translations acct.json (German) 2019-10-05 00:44:19 +09:00
Cutls
156f5aec91 New translations index.json (German) 2019-10-05 00:44:18 +09:00
Cutls
9045e5aa90 New translations main.json (German) 2019-10-05 00:44:17 +09:00
Cutls
5ca9d2f1b1 New translations setting.json (German) 2019-10-05 00:44:15 +09:00
Cutls
6cb5bcfb0c New translations update.json (German) 2019-10-05 00:44:14 +09:00
Cutls
ffaff7c356 New translations index.json (French) 2019-10-05 00:44:12 +09:00
Cutls
130fc4996f New translations acct.json (Chinese Simplified) 2019-10-05 00:44:11 +09:00
Cutls
a95141048d New translations main.json (Chinese Simplified) 2019-10-05 00:44:10 +09:00
Cutls
2d82382f34 New translations setting.json (Chinese Simplified) 2019-10-05 00:44:04 +09:00
Cutls
6afd975913 New translations update.json (Chinese Simplified) 2019-10-05 00:44:03 +09:00
Cutls
0df0eb104c New translations acct.json (Czech) 2019-10-05 00:44:02 +09:00
Cutls
f1c5d3605c New translations index.json (Czech) 2019-10-05 00:44:01 +09:00
Cutls
afed289647 New translations main.json (Czech) 2019-10-05 00:43:59 +09:00
Cutls
22fb1fb8c9 New translations setting.json (Czech) 2019-10-05 00:43:57 +09:00
Cutls
5809d4efca New translations index.json (Chinese Simplified) 2019-10-05 00:43:56 +09:00
Cutls
332e215c85 New translations acct.json (French) 2019-10-05 00:43:55 +09:00
Cutls
9eefbe9fb9 New translations main.json (Spanish) 2019-10-05 00:35:54 +09:00
Cutls
3fa86d3236 New translations setting.json (Chinese Simplified) 2019-10-05 00:35:13 +09:00
Cutls
f0e125df08 New translations main.json (Chinese Simplified) 2019-10-05 00:35:10 +09:00
Cutls
8bf7d0efd4 New translations index.json (Chinese Simplified) 2019-10-05 00:35:08 +09:00
Cutls
8a71dfa591 New translations acct.json (Chinese Simplified) 2019-10-05 00:35:07 +09:00
Cutls
928dee677f New translations update.json (Catalan) 2019-10-05 00:35:06 +09:00
Cutls
bf5500eb19 New translations setting.json (Catalan) 2019-10-05 00:35:05 +09:00
Cutls
a5efb1b4b6 New translations main.json (Catalan) 2019-10-05 00:35:03 +09:00
Cutls
5aa77a67a8 New translations update.json (Chinese Simplified) 2019-10-05 00:35:01 +09:00
Cutls
c5c22f8dc9 New translations index.json (Catalan) 2019-10-05 00:35:00 +09:00
Cutls
ad3ae5e6b1 New translations update.json (Bulgarian) 2019-10-05 00:34:57 +09:00
Cutls
ed029ecb01 New translations setting.json (Bulgarian) 2019-10-05 00:34:56 +09:00
Cutls
ff45c64a22 New translations main.json (Bulgarian) 2019-10-05 00:34:55 +09:00
Cutls
c953091e8d New translations index.json (Bulgarian) 2019-10-05 00:34:53 +09:00
Cutls
fd30ab7168 New translations acct.json (Bulgarian) 2019-10-05 00:34:52 +09:00
Cutls
dca3dddba0 New translations update.json (Arabic) 2019-10-05 00:34:51 +09:00
Cutls
41eb4c54a4 New translations acct.json (Catalan) 2019-10-05 00:34:50 +09:00
Cutls
15a2333010 New translations setting.json (Arabic) 2019-10-05 00:34:49 +09:00
Cutls
1061d2867f New translations acct.json (Chinese Traditional) 2019-10-05 00:34:48 +09:00
Cutls
64ba1f1ea1 New translations main.json (Chinese Traditional) 2019-10-05 00:34:46 +09:00
Cutls
196cc664c8 New translations acct.json (Spanish) 2019-10-05 00:34:45 +09:00
Cutls
1d871d4d68 New translations update.json (Serbian (Cyrillic)) 2019-10-05 00:34:44 +09:00
Cutls
89475a9838 New translations setting.json (Serbian (Cyrillic)) 2019-10-05 00:34:43 +09:00
Cutls
52d335cbfd New translations main.json (Serbian (Cyrillic)) 2019-10-05 00:34:41 +09:00
Cutls
333ca4f36a New translations index.json (Serbian (Cyrillic)) 2019-10-05 00:34:39 +09:00
Cutls
d2e18c5400 New translations main.json (Danish) 2019-10-05 00:34:38 +09:00
Cutls
f04cc92b44 New translations index.json (Danish) 2019-10-05 00:34:37 +09:00
Cutls
fa3a048a6c New translations index.json (Chinese Traditional) 2019-10-05 00:34:35 +09:00
Cutls
6200034dd0 New translations acct.json (Danish) 2019-10-05 00:34:33 +09:00
Cutls
9a25d82c48 New translations setting.json (Czech) 2019-10-05 00:34:32 +09:00
Cutls
95e0d3953e New translations main.json (Czech) 2019-10-05 00:34:31 +09:00
Cutls
fb91da4b69 New translations index.json (Czech) 2019-10-05 00:34:29 +09:00
Cutls
74fcd2df7b New translations acct.json (Czech) 2019-10-05 00:34:28 +09:00
Cutls
1a88a08454 New translations update.json (Chinese Traditional) 2019-10-05 00:34:27 +09:00
Cutls
688cf579d6 New translations setting.json (Chinese Traditional) 2019-10-05 00:34:26 +09:00
Cutls
ba9ba5f55b New translations update.json (Czech) 2019-10-05 00:34:24 +09:00
Cutls
8341733dc2 New translations main.json (Arabic) 2019-10-05 00:34:23 +09:00
Cutls
54f7a0f20e New translations acct.json (Arabic) 2019-10-05 00:34:22 +09:00
Cutls
b2382d91d6 New translations index.json (Arabic) 2019-10-05 00:34:12 +09:00
Cutls
b729780ac1 New translations update.json (Afrikaans) 2019-10-05 00:34:09 +09:00
Cutls
6f4c516d0c New translations setting.json (Afrikaans) 2019-10-05 00:34:08 +09:00
Cutls
b9bdcba4f9 New translations main.json (Afrikaans) 2019-10-05 00:34:07 +09:00
Cutls
bd69863799 New translations index.json (Afrikaans) 2019-10-05 00:34:05 +09:00
Cutls
375fdc444e New translations acct.json (Afrikaans) 2019-10-05 00:34:03 +09:00
Cutls
e832592b35 New translations update.json (English) 2019-10-05 00:26:57 +09:00
Cutls
a15d4e097e New translations main.json (Hebrew) 2019-10-05 00:26:57 +09:00
Cutls
2597d2455c New translations setting.json (Hebrew) 2019-10-05 00:26:55 +09:00
Cutls
16e817d42c New translations update.json (Hebrew) 2019-10-05 00:26:54 +09:00
Cutls
c6d39a9e60 New translations acct.json (Hungarian) 2019-10-05 00:26:53 +09:00
Cutls
b860f1a170 New translations index.json (Hungarian) 2019-10-05 00:26:52 +09:00
Cutls
0cebd0b7f3 New translations main.json (Hungarian) 2019-10-05 00:26:50 +09:00
Cutls
91742c1b80 New translations setting.json (Hungarian) 2019-10-05 00:26:48 +09:00
Cutls
64bc79de38 New translations update.json (Hungarian) 2019-10-05 00:26:46 +09:00
Cutls
55239be477 New translations acct.json (Italian) 2019-10-05 00:26:45 +09:00
Cutls
0feebb662f New translations index.json (Italian) 2019-10-05 00:26:44 +09:00
Cutls
1699f9d141 New translations main.json (Italian) 2019-10-05 00:26:42 +09:00
Cutls
7ac9df9496 New translations index.json (Hebrew) 2019-10-05 00:26:41 +09:00
Cutls
2074818cd0 New translations setting.json (Italian) 2019-10-05 00:26:39 +09:00
Cutls
ecb3eaf541 New translations acct.json (Norwegian) 2019-10-05 00:26:38 +09:00
Cutls
345455da4b New translations index.json (Norwegian) 2019-10-05 00:26:37 +09:00
Cutls
1937fddbfd New translations main.json (Norwegian) 2019-10-05 00:26:35 +09:00
Cutls
e7534bbcbd New translations setting.json (Norwegian) 2019-10-05 00:26:34 +09:00
Cutls
305192eae6 New translations update.json (Norwegian) 2019-10-05 00:26:32 +09:00
Cutls
0541aa3373 New translations acct.json (Polish) 2019-10-05 00:26:31 +09:00
Cutls
81fe8b7435 New translations index.json (Polish) 2019-10-05 00:26:30 +09:00
Cutls
4ca26b4e32 New translations main.json (Polish) 2019-10-05 00:26:29 +09:00
Cutls
d348a67ba8 New translations setting.json (Polish) 2019-10-05 00:26:28 +09:00
Cutls
e2f03ee8d6 New translations update.json (Polish) 2019-10-05 00:26:26 +09:00
Cutls
0e64c46064 New translations update.json (Italian) 2019-10-05 00:26:25 +09:00
Cutls
987a4125ae New translations acct.json (Portuguese) 2019-10-05 00:26:24 +09:00
Cutls
a7e4c1a5a5 New translations acct.json (Hebrew) 2019-10-05 00:26:24 +09:00
Cutls
6d66982d35 New translations setting.json (Greek) 2019-10-05 00:26:23 +09:00
Cutls
7c78e05649 New translations acct.json (Dutch) 2019-10-05 00:26:21 +09:00
Cutls
61383ef294 New translations index.json (Dutch) 2019-10-05 00:26:20 +09:00
Cutls
469d4ec566 New translations main.json (Dutch) 2019-10-05 00:26:18 +09:00
Cutls
418f1146b7 New translations setting.json (Dutch) 2019-10-05 00:26:17 +09:00
Cutls
170c8885d0 New translations update.json (Dutch) 2019-10-05 00:26:15 +09:00
Cutls
e3f04f4ab8 New translations acct.json (Finnish) 2019-10-05 00:26:14 +09:00
Cutls
791b8142bd New translations index.json (Finnish) 2019-10-05 00:26:13 +09:00
Cutls
ffff89ae96 New translations main.json (Finnish) 2019-10-05 00:26:11 +09:00
Cutls
3c8b0f6308 New translations setting.json (Finnish) 2019-10-05 00:26:10 +09:00
Cutls
a01aa8c335 New translations update.json (Finnish) 2019-10-05 00:26:08 +09:00
Cutls
1dc1e6f081 New translations acct.json (French) 2019-10-05 00:26:07 +09:00
Cutls
b86447cdbf New translations update.json (Greek) 2019-10-05 00:26:06 +09:00
Cutls
bf1e805269 New translations index.json (French) 2019-10-05 00:26:05 +09:00
Cutls
0b0d551730 New translations setting.json (French) 2019-10-05 00:26:03 +09:00
Cutls
22016d2856 New translations update.json (French) 2019-10-05 00:26:02 +09:00
Cutls
6ef5d66521 New translations acct.json (German) 2019-10-05 00:26:01 +09:00
Cutls
bbf80408d4 New translations index.json (German) 2019-10-05 00:26:00 +09:00
Cutls
f7c7614625 New translations main.json (German) 2019-10-05 00:25:58 +09:00
Cutls
c5e71230e3 New translations setting.json (German) 2019-10-05 00:25:56 +09:00
Cutls
d61e15a02c New translations update.json (German) 2019-10-05 00:25:55 +09:00
Cutls
981d286e13 New translations acct.json (Greek) 2019-10-05 00:25:54 +09:00
Cutls
f58c3e9a67 New translations index.json (Greek) 2019-10-05 00:25:53 +09:00
Cutls
c316c381f8 New translations main.json (Greek) 2019-10-05 00:25:52 +09:00
Cutls
066ae678f9 New translations main.json (French) 2019-10-05 00:25:50 +09:00
Cutls
c3a75a5525 New translations update.json (Danish) 2019-10-05 00:25:49 +09:00
Cutls
14257ba448 New translations index.json (Portuguese) 2019-10-05 00:25:48 +09:00
Cutls
2c7e86fa97 New translations setting.json (Portuguese) 2019-10-05 00:25:46 +09:00
Cutls
63d7b7a471 New translations index.json (Swedish) 2019-10-05 00:25:44 +09:00
Cutls
98a882f450 New translations main.json (Swedish) 2019-10-05 00:25:43 +09:00
Cutls
868fd1ddc5 New translations setting.json (Swedish) 2019-10-05 00:25:42 +09:00
Cutls
9c19819a08 New translations update.json (Swedish) 2019-10-05 00:25:41 +09:00
Cutls
62ef634bc0 New translations acct.json (Turkish) 2019-10-05 00:25:40 +09:00
Cutls
f4158deb0a New translations index.json (Turkish) 2019-10-05 00:25:39 +09:00
Cutls
e61a224fc6 New translations main.json (Turkish) 2019-10-05 00:25:37 +09:00
Cutls
c83fb868e4 New translations setting.json (Turkish) 2019-10-05 00:25:35 +09:00
Cutls
0a118f1740 New translations update.json (Turkish) 2019-10-05 00:25:34 +09:00
Cutls
d5d6edd2fb New translations acct.json (Ukrainian) 2019-10-05 00:25:33 +09:00
Cutls
e17382f441 New translations index.json (Ukrainian) 2019-10-05 00:25:32 +09:00
Cutls
6c6fe5378f New translations acct.json (Swedish) 2019-10-05 00:25:31 +09:00
Cutls
b68a31b2ee New translations main.json (Ukrainian) 2019-10-05 00:25:30 +09:00
Cutls
0be362e82c New translations update.json (Ukrainian) 2019-10-05 00:25:29 +09:00
Cutls
17a917ad00 New translations acct.json (Vietnamese) 2019-10-05 00:25:28 +09:00
Cutls
f975fbf221 New translations index.json (Vietnamese) 2019-10-05 00:25:27 +09:00
Cutls
1741813003 New translations main.json (Vietnamese) 2019-10-05 00:25:25 +09:00
Cutls
7e7e24021b New translations setting.json (Vietnamese) 2019-10-05 00:25:23 +09:00
Cutls
a662106228 New translations update.json (Vietnamese) 2019-10-05 00:25:22 +09:00
Cutls
be98a562d4 New translations acct.json (English) 2019-10-05 00:25:21 +09:00
Cutls
2af4692e1a New translations index.json (English) 2019-10-05 00:25:20 +09:00
Cutls
b525ac18bc New translations main.json (English) 2019-10-05 00:25:19 +09:00
Cutls
3fdca1ba64 New translations setting.json (English) 2019-10-05 00:25:18 +09:00
Cutls
9cc721bf80 New translations setting.json (Ukrainian) 2019-10-05 00:25:17 +09:00
Cutls
d9cbd5d173 New translations main.json (Portuguese) 2019-10-05 00:25:15 +09:00
Cutls
59f5cb9d35 New translations update.json (Spanish, Argentina) 2019-10-05 00:25:13 +09:00
Cutls
bd020c14fb New translations main.json (Spanish, Argentina) 2019-10-05 00:25:12 +09:00
Cutls
7b9f814d37 New translations update.json (Portuguese) 2019-10-05 00:25:11 +09:00
Cutls
7a6fe30ee5 New translations acct.json (Portuguese, Brazilian) 2019-10-05 00:25:10 +09:00
Cutls
9910adbb40 New translations index.json (Portuguese, Brazilian) 2019-10-05 00:25:09 +09:00
Cutls
ad6a578863 New translations main.json (Portuguese, Brazilian) 2019-10-05 00:25:08 +09:00
Cutls
365120ed9f New translations setting.json (Portuguese, Brazilian) 2019-10-05 00:25:06 +09:00
Cutls
dbd0541ad1 New translations update.json (Portuguese, Brazilian) 2019-10-05 00:25:05 +09:00
Cutls
7ce16856ec New translations acct.json (Romanian) 2019-10-05 00:25:04 +09:00
Cutls
8fff3e4ec0 New translations index.json (Romanian) 2019-10-05 00:25:03 +09:00
Cutls
53f559a750 New translations main.json (Romanian) 2019-10-05 00:25:01 +09:00
Cutls
924fc30697 New translations setting.json (Romanian) 2019-10-05 00:25:00 +09:00
Cutls
41955f8927 New translations setting.json (Spanish, Argentina) 2019-10-05 00:24:59 +09:00
Cutls
83689f420c New translations update.json (Romanian) 2019-10-05 00:24:57 +09:00
Cutls
1c68a0fd4b New translations index.json (Russian) 2019-10-05 00:24:56 +09:00
Cutls
9e25db7089 New translations main.json (Russian) 2019-10-05 00:24:55 +09:00
Cutls
7eacd54a9c New translations setting.json (Russian) 2019-10-05 00:24:53 +09:00
Cutls
be44519431 New translations update.json (Russian) 2019-10-05 00:24:52 +09:00
Cutls
66f35b2720 New translations acct.json (Serbian (Cyrillic)) 2019-10-05 00:24:51 +09:00
Cutls
23902d2465 New translations index.json (Spanish) 2019-10-05 00:24:50 +09:00
Cutls
1c3717edef New translations setting.json (Spanish) 2019-10-05 00:24:48 +09:00
Cutls
17fa0f3eb0 New translations update.json (Spanish) 2019-10-05 00:24:47 +09:00
Cutls
247e19f1e3 New translations acct.json (Spanish, Argentina) 2019-10-05 00:24:46 +09:00
Cutls
54fae816d2 New translations index.json (Spanish, Argentina) 2019-10-05 00:24:45 +09:00
Cutls
3b70a2cc2d New translations acct.json (Russian) 2019-10-05 00:24:43 +09:00
Cutls
acd4a16dcb New translations setting.json (Danish) 2019-10-05 00:24:42 +09:00
Cutls
550c84c367 Update Crowdin configuration file 2019-10-05 00:24:35 +09:00
Cutls
e35e0be251 New translations acct.json (Spanish) 2019-10-05 00:24:35 +09:00
Cutls
db5ada2cfb New translations main.json (Spanish) 2019-10-05 00:24:34 +09:00
Cutls
643f452064 New translations update.json (Serbian (Cyrillic)) 2019-10-05 00:24:33 +09:00
Cutls
bbda6c6785 New translations setting.json (Serbian (Cyrillic)) 2019-10-05 00:24:32 +09:00
Cutls
e6449cd818 New translations main.json (Serbian (Cyrillic)) 2019-10-05 00:24:30 +09:00
Cutls
708527db77 New translations index.json (Serbian (Cyrillic)) 2019-10-05 00:24:28 +09:00
Cutls
b1aa6c5699 New translations index.json (Bulgarian) 2019-10-05 00:24:26 +09:00
Cutls
eeaa1a7f07 New translations acct.json (Catalan) 2019-10-05 00:24:25 +09:00
Cutls
52b7183935 New translations update.json (Bulgarian) 2019-10-05 00:24:24 +09:00
Cutls
386833ae64 New translations setting.json (Bulgarian) 2019-10-05 00:24:23 +09:00
Cutls
d4a48ce585 New translations main.json (Catalan) 2019-10-05 00:24:22 +09:00
Cutls
4931cdd272 New translations main.json (Bulgarian) 2019-10-05 00:24:20 +09:00
Cutls
d7933dc73f New translations index.json (Catalan) 2019-10-05 00:24:19 +09:00
Cutls
9a1048cc17 New translations acct.json (Bulgarian) 2019-10-05 00:24:17 +09:00
Cutls
a8fd0736b3 New translations index.json (Arabic) 2019-10-05 00:24:16 +09:00
Cutls
10d884a837 New translations setting.json (Arabic) 2019-10-05 00:24:08 +09:00
Cutls
52b28c79c7 New translations main.json (Arabic) 2019-10-05 00:24:06 +09:00
Cutls
8a36e55813 New translations acct.json (Arabic) 2019-10-05 00:24:05 +09:00
Cutls
5103bb2697 New translations update.json (Afrikaans) 2019-10-05 00:24:04 +09:00
Cutls
c6a07714ba New translations setting.json (Afrikaans) 2019-10-05 00:24:03 +09:00
Cutls
48c3500033 New translations setting.json (Catalan) 2019-10-05 00:24:01 +09:00
Cutls
d155e75a5d New translations main.json (Afrikaans) 2019-10-05 00:23:59 +09:00
Cutls
fa481129a9 New translations update.json (Arabic) 2019-10-05 00:23:58 +09:00
Cutls
3c1402dab7 New translations update.json (Catalan) 2019-10-05 00:23:57 +09:00
Cutls
a7f4189bd3 New translations main.json (Czech) 2019-10-05 00:23:56 +09:00
Cutls
64ed13de7c New translations index.json (Chinese Simplified) 2019-10-05 00:23:55 +09:00
Cutls
21394eb29e New translations index.json (Afrikaans) 2019-10-05 00:23:54 +09:00
Cutls
fbb8c3613f New translations main.json (Danish) 2019-10-05 00:23:52 +09:00
Cutls
7778da80d5 New translations index.json (Danish) 2019-10-05 00:23:51 +09:00
Cutls
e791e102d5 New translations acct.json (Danish) 2019-10-05 00:23:50 +09:00
Cutls
deb73450c3 New translations update.json (Czech) 2019-10-05 00:23:49 +09:00
Cutls
cc9d1bf4f2 New translations setting.json (Czech) 2019-10-05 00:23:48 +09:00
Cutls
b025ef8b22 New translations index.json (Czech) 2019-10-05 00:23:46 +09:00
Cutls
7bda0f400a New translations acct.json (Chinese Simplified) 2019-10-05 00:23:45 +09:00
Cutls
3b7a113a11 New translations acct.json (Czech) 2019-10-05 00:23:44 +09:00
Cutls
ee636bf88c New translations setting.json (Chinese Traditional) 2019-10-05 00:23:43 +09:00
Cutls
52144d8e52 New translations main.json (Chinese Traditional) 2019-10-05 00:23:41 +09:00
Cutls
513c686dea New translations index.json (Chinese Traditional) 2019-10-05 00:23:39 +09:00
Cutls
29cc2429ae New translations acct.json (Chinese Traditional) 2019-10-05 00:23:38 +09:00
Cutls
31219e9ac1 New translations update.json (Chinese Simplified) 2019-10-05 00:23:37 +09:00
Cutls
3beab5a9e1 New translations setting.json (Chinese Simplified) 2019-10-05 00:23:36 +09:00
Cutls
7558311531 New translations main.json (Chinese Simplified) 2019-10-05 00:23:35 +09:00
Cutls
106d08a899 New translations update.json (Chinese Traditional) 2019-10-05 00:23:33 +09:00
Cutls
02f203475d New translations acct.json (Afrikaans) 2019-10-05 00:23:32 +09:00
Cutls
b4460eddf7 Update Crowdin configuration file 2019-10-05 00:23:16 +09:00
Cutls
90e06116d1 Merge branch 'master' of https://github.com/cutls/TheDesk 2019-10-05 00:22:02 +09:00
Cutls
1e4397ed7b Fix: mugen streaming reconnect 2019-10-05 00:21:52 +09:00
Cutls
e9cc2d0e52 Change: locales 2019-10-05 00:07:15 +09:00
Cutls
376847b489 Update Crowdin configuration file 2019-10-04 23:54:24 +09:00
Cutls
5d61b83c50 Update Crowdin configuration file 2019-10-04 23:43:03 +09:00
Cutls
561b3a594b Delete files 2019-10-04 23:39:59 +09:00
dependabot-preview[bot]
2d0acb68b1 Bump json5 from 2.1.0 to 2.1.1 in /app
Bumps [json5](https://github.com/json5/json5) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/v2.1.1/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v2.1.0...v2.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-03 04:16:36 +00:00
Cutls
919c6c40e2 Fix: when acct-sel, not showing current acct prof img 2019-10-03 02:14:22 +09:00
Cutls
120e9da1c9 Add: Argentine Spanish locale 2019-10-03 02:01:42 +09:00
Cutls
47c6454c00 Add: categorize of custom emojis 2019-10-03 01:38:55 +09:00
Cutls
02f49cd392 WIP: fix: write position of window 2019-10-03 01:38:21 +09:00
Cutls
8117ddb6ce Add: click custom emojis to zoom in 2019-10-03 01:37:33 +09:00
dependabot-preview[bot]
d372fa8e6e Bump electron from 6.0.10 to 6.0.11 in /app
Bumps [electron](https://github.com/electron/electron) from 6.0.10 to 6.0.11.
- [Release notes](https://github.com/electron/electron/releases)
- [Commits](https://github.com/electron/electron/compare/v6.0.10...v6.0.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-02 04:14:38 +00:00
dependabot-preview[bot]
c3ed865a3a Bump sweetalert2 from 8.17.6 to 8.18.0 in /app
Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 8.17.6 to 8.18.0.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v8.17.6...v8.18.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-01 03:10:07 +00:00
Cutls
96c137ec4b Merge branch 'master' of https://github.com/cutls/TheDesk 2019-09-30 02:29:37 +09:00
Cutls
c5cd683aa5 Add: warning on logining Pleroma, PixelFed or something compatible platform 2019-09-30 02:29:26 +09:00
Cutls
c5cdabaa3a Change: move and add poll parser 2019-09-30 02:23:25 +09:00
Cutls
d19be3f2cb Fix: resolving error 2019-09-30 02:23:10 +09:00
Cutls
a9f55aa64f Add: compatibility viewer 2019-09-30 02:22:44 +09:00
Cutls
dfb0f79c92 Fix: cannot resolve and open on browser about Misskey Live URL 2019-09-30 02:21:59 +09:00
Cutls
4a59438c0c Change: tag trending graph design 2019-09-30 02:21:18 +09:00
Cutls
f35710d652 DevTools is opened automaticaly when launching 2019-09-30 02:20:06 +09:00
Cutls
c19a532f3e Merge pull request #121 from cutls/dependabot/npm_and_yarn/app/jimp-0.8.4
Bump jimp from 0.8.3 to 0.8.4 in /app
2019-09-28 03:22:26 +09:00
Cutls
be6b278b3c Merge pull request #122 from cutls/dependabot/npm_and_yarn/app/fortawesome/fontawesome-free-5.11.2
Bump @fortawesome/fontawesome-free from 5.11.1 to 5.11.2 in /app
2019-09-28 03:22:11 +09:00
Cutls
78c16dc278 Merge pull request #123 from cutls/dependabot/npm_and_yarn/app/node-notifier-6.0.0
Bump node-notifier from 5.4.3 to 6.0.0 in /app
2019-09-28 03:21:53 +09:00
Cutls
09d2839a00 Add: BouyomiChan connection 2019-09-26 00:04:50 +09:00
dependabot-preview[bot]
d17d52436f Bump node-notifier from 5.4.3 to 6.0.0 in /app
Bumps [node-notifier](https://github.com/mikaelbr/node-notifier) from 5.4.3 to 6.0.0.
- [Release notes](https://github.com/mikaelbr/node-notifier/releases)
- [Changelog](https://github.com/mikaelbr/node-notifier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mikaelbr/node-notifier/compare/v5.4.3...v6.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23 23:00:07 +00:00
dependabot-preview[bot]
5c522a33d0 Bump @fortawesome/fontawesome-free from 5.11.1 to 5.11.2 in /app
Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 5.11.1 to 5.11.2.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/5.11.1...5.11.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23 22:59:38 +00:00
Cutls
c9cf89adeb TheDesk Usain (18.10.1) 2019-09-22 20:36:11 +09:00
Cutls
c5c996cb7a Merge branch 'master' of https://github.com/cutls/TheDesk 2019-09-22 19:56:13 +09:00
Cutls
f2ec258e7a Change: markers API trigger 2019-09-22 19:55:59 +09:00
Cutls
8c29f21970 Travis (comp) 2019-09-22 19:55:22 +09:00
dependabot-preview[bot]
5b730d2c38 Bump jimp from 0.8.3 to 0.8.4 in /app
Bumps [jimp](https://github.com/oliver-moran/jimp) from 0.8.3 to 0.8.4.
- [Release notes](https://github.com/oliver-moran/jimp/releases)
- [Changelog](https://github.com/oliver-moran/jimp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/oliver-moran/jimp/compare/v0.8.3...v0.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-20 20:19:52 +00:00
Cutls
609e84a8ae Merge pull request #118 from cutls/dependabot/npm_and_yarn/app/jimp-0.8.3
Bump jimp from 0.8.2 to 0.8.3 in /app
2019-09-20 22:53:55 +09:00
Cutls
7ca778f81b Merge pull request #119 from cutls/dependabot/npm_and_yarn/app/sweetalert2-8.17.6
Bump sweetalert2 from 8.17.4 to 8.17.6 in /app
2019-09-20 22:53:36 +09:00
Cutls
93b194af3b Merge pull request #120 from cutls/dependabot/npm_and_yarn/app/fortawesome/fontawesome-free-5.11.1
Bump @fortawesome/fontawesome-free from 5.11.0 to 5.11.1 in /app
2019-09-20 22:53:25 +09:00
Cutls
b3e1f32ffe Merge pull request #117 from cutls/dependabot/npm_and_yarn/app/electron-6.0.10
Bump electron from 6.0.9 to 6.0.10 in /app
2019-09-20 22:52:14 +09:00
dependabot-preview[bot]
d78b3bffeb Bump @fortawesome/fontawesome-free from 5.11.0 to 5.11.1 in /app
Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 5.11.0 to 5.11.1.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/5.11.0...5.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-19 20:26:51 +00:00
dependabot-preview[bot]
bff5038a64 Bump sweetalert2 from 8.17.4 to 8.17.6 in /app
Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 8.17.4 to 8.17.6.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v8.17.4...v8.17.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-19 20:26:23 +00:00
dependabot-preview[bot]
0c7fcfbcc5 Bump jimp from 0.8.2 to 0.8.3 in /app
Bumps [jimp](https://github.com/oliver-moran/jimp) from 0.8.2 to 0.8.3.
- [Release notes](https://github.com/oliver-moran/jimp/releases)
- [Changelog](https://github.com/oliver-moran/jimp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/oliver-moran/jimp/compare/v0.8.2...v0.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-19 20:25:54 +00:00
dependabot-preview[bot]
9d6fc15959 Bump electron from 6.0.9 to 6.0.10 in /app
Bumps [electron](https://github.com/electron/electron) from 6.0.9 to 6.0.10.
- [Release notes](https://github.com/electron/electron/releases)
- [Commits](https://github.com/electron/electron/compare/v6.0.9...v6.0.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-19 20:25:35 +00:00
Cutls
5bad5e1031 Merge pull request #116 from cutls/dependabot/npm_and_yarn/app/fortawesome/fontawesome-free-5.11.0
Bump @fortawesome/fontawesome-free from 5.10.2 to 5.11.0 in /app
2019-09-19 20:07:26 +09:00
Cutls
f8d6ec3a8f Merge pull request #114 from cutls/dependabot/npm_and_yarn/app/sweetalert2-8.17.4
Bump sweetalert2 from 8.17.3 to 8.17.4 in /app
2019-09-19 20:07:14 +09:00
dependabot-preview[bot]
9a3dc81630 Bump @fortawesome/fontawesome-free from 5.10.2 to 5.11.0 in /app
Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 5.10.2 to 5.11.0.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/5.10.2...5.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-18 20:30:43 +00:00
Cutls
3d9b97ccb5 WIP: Travis WIndows 1 2019-09-18 23:39:55 +09:00
Cutls
2c3dbba052 to Travis CI error for Windows 2019-09-18 23:32:31 +09:00
Cutls
907eecd030 fix 2019-09-18 23:25:22 +09:00
dependabot-preview[bot]
75026bf42d Bump sweetalert2 from 8.17.3 to 8.17.4 in /app
Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 8.17.3 to 8.17.4.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v8.17.3...v8.17.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-18 14:25:11 +00:00
Cutls
d217fb33a9 Like Typo 2019-09-18 23:24:34 +09:00
Cutls
8cea32d01b For developers 2019-09-18 23:23:40 +09:00
Cutls
c8d2da0c07 For Linux, macOS 2019-09-18 23:11:39 +09:00
Cutls
a458f51b9a travis 2019-09-17 01:43:01 +09:00
Cutls
bd8ac2935b to Travis 2019-09-17 01:37:18 +09:00
Cutls
dd59cc1468 Introduce yarn 2019-09-17 01:20:52 +09:00
Cutls
fd365c52cc Merge branch 'master' of https://github.com/cutls/TheDesk 2019-09-17 00:59:39 +09:00
Cutls
ad7e77a067 Add: notif-sound volume 2019-09-17 00:59:25 +09:00
Cutls
6b9135a205 remove v1 serach API 2019-09-17 00:24:16 +09:00
Cutls
fdca5b1c60 When complete vote, not refresh status 2019-09-17 00:24:00 +09:00
Cutls
f891b30f9f When unknown media, show after last"." 2019-09-17 00:23:41 +09:00
Cutls
8fbd8070f2 For Pleroma tags 2019-09-17 00:22:55 +09:00
Cutls
657dec1c10 When redraft, diabled acct-sel 2019-09-17 00:22:40 +09:00
Cutls
0d93dcdc45 Merge pull request #113 from cutls/dependabot/npm_and_yarn/app/jimp-tw-0.8.2
Update jimp requirement from ^0.7.0 to ^0.8.2 in /app
2019-09-14 12:13:26 +09:00
dependabot-preview[bot]
5a50c0e1e6 Update jimp requirement from ^0.7.0 to ^0.8.2 in /app
Updates the requirements on [jimp](https://github.com/oliver-moran/jimp) to permit the latest version.
- [Release notes](https://github.com/oliver-moran/jimp/releases)
- [Changelog](https://github.com/oliver-moran/jimp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/oliver-moran/jimp/compare/v0.7.0...v0.8.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-13 20:26:10 +00:00
Cutls
ab8da89fbc Package and make.js 2019-09-14 02:24:06 +09:00
Cutls
c9edf47643 TheDesk Usamin (18.10.0) 2019-09-14 02:23:24 +09:00
Cutls
84328bf693 Fix: if toot content is blank 2019-09-14 02:18:33 +09:00
Cutls
6fdbf0b48e Add: resizable column 2019-09-14 02:10:02 +09:00
Cutls
8b1d5b3cb4 Change: make.js 2019-09-12 23:35:13 +09:00
Cutls
bf69d23379 Add: Welcome guide 2019-09-12 23:25:27 +09:00
Cutls
a4e3031796 Add: some CORS error 2019-09-12 21:30:48 +09:00
Cutls
286e7956f2 Add: featured tag 2019-09-09 23:26:57 +09:00
Cutls
e04b64a326 Unread misc 2019-09-08 09:39:26 +09:00
Cutls
c86a99df06 Add: markers and columnReload on notf 2019-09-08 01:44:28 +09:00
Cutls
3b69c4e7c1 Add: quote 2019-09-08 01:33:01 +09:00
Cutls
bc5be9449d Add: some supported instance and add 'quote' support or not info 2019-09-08 01:02:40 +09:00
Cutls
b968e59db1 Merge pull request #110 from cutls/dependabot/npm_and_yarn/app/jimp-tw-0.7.0
Update jimp requirement from ^0.6.4 to ^0.7.0 in /app
2019-09-07 05:28:47 +09:00
dependabot-preview[bot]
fa06c4a729 Update jimp requirement from ^0.6.4 to ^0.7.0 in /app
Updates the requirements on [jimp](https://github.com/oliver-moran/jimp) to permit the latest version.
- [Release notes](https://github.com/oliver-moran/jimp/releases)
- [Changelog](https://github.com/oliver-moran/jimp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/oliver-moran/jimp/compare/v0.6.4...v0.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-06 20:26:15 +00:00
Cutls
81b99515cd Add: POST markers 2019-09-07 01:46:50 +09:00
Cutls
5e6c713f9d Merge branch 'master' of https://github.com/cutls/TheDesk 2019-09-07 01:33:41 +09:00
Cutls
376425cc98 Add: demo: unread reader 2019-09-07 01:33:30 +09:00
Cutls
38cff550e1 Add: identity_proof 2019-09-05 23:55:34 +09:00
Cutls
64781c1cca Developer -> Main author 2019-09-03 09:57:56 +09:00
Cutls
e82e85b5ea Fix: replycount 2019-09-02 00:14:33 +09:00
Cutls
2b84a27cdc TheDesk Usain (18.9.2) 2019-09-01 21:27:18 +09:00
Cutls
6f7f5cbabc Fix: poll UI 2019-09-01 01:46:42 +09:00
Cutls
174a8696b0 fix 2019-09-01 01:32:05 +09:00
Cutls
d5a27ba814 TheDesk Usamin (18.9.1) 2019-09-01 01:31:19 +09:00
Cutls
6e2e488565 Fix: instance actor 2019-09-01 00:02:34 +09:00
Cutls
7d02ef2b3e TheDesk Usamin (18.9.0) 2019-08-31 23:35:18 +09:00
Cutls
f8f2719c5d Merge branch 'master' of https://github.com/cutls/TheDesk 2019-08-31 00:10:37 +09:00
Cutls
da6faaf1a5 Add: timeago on acct 2019-08-31 00:10:24 +09:00
Cutls
350068d6f1 Add: locale 2019-08-31 00:10:16 +09:00
Cutls
70bee4265b Add: custom CSS request 2019-08-31 00:10:01 +09:00
Cutls
18ce8cf2f4 Add: show note and last-status on acct 2019-08-31 00:09:37 +09:00
Cutls
b50a55cce7 Add: multi-lang relative time 2019-08-31 00:09:01 +09:00
Cutls
e6f0e18aed Update README.md 2019-08-30 09:59:21 +09:00
Cutls
fd7daa407a Update README_ja.md 2019-08-30 09:58:51 +09:00
Cutls
0dead93606 Add: resizable menu 2019-08-30 01:46:30 +09:00
Cutls
5d6e8cf9b3 Add: search offset 2019-08-30 01:46:19 +09:00
Cutls
a0544e21e3 Add: directory 2019-08-30 01:46:04 +09:00
Cutls
d54112d41c Fix: bottom buttons group padding(top) 2019-08-30 01:45:32 +09:00
Cutls
1a0ba40b43 Introduce: via npm 2019-08-30 01:45:07 +09:00
Cutls
5d8ca9566a Add and fix 2019-08-29 01:33:06 +09:00
Cutls
834fa719b2 Introduce: JSON5 and export v2.1 2019-08-29 01:20:47 +09:00
Cutls
89bde2739a Merge branch 'master' of https://github.com/cutls/TheDesk 2019-08-26 21:06:11 +09:00
Cutls
46dbc9ae62 Add: GIt hash 2019-08-26 21:06:07 +09:00
Cutls
71554fca59 Merge pull request #109 from yzrsng/master
Enforce single instance for linux and windows
2019-08-26 13:10:20 +09:00
yzrsng
1c76b5886f Enforce single instance for linux and windows 2019-08-26 12:58:04 +09:00
Cutls
5007b70683 Add: git hash 2019-08-26 00:09:01 +09:00
Cutls
5694cbd945 Delete: can make file 2019-08-26 00:08:51 +09:00
Cutls
eee3c34dd7 TheDesk Usamin (18.8.3) 2019-08-25 22:40:33 +09:00
Cutls
cac39ad539 Fix: cannot follow at Pawoo 2019-08-25 22:22:44 +09:00
Cutls
1b68cdf7db Change: move user matching to More dropdown 2019-08-24 21:19:52 +09:00
Cutls
845c9a0f2e Merge branch 'master' of https://github.com/cutls/TheDesk 2019-08-24 01:10:08 +09:00
Cutls
24c69af942 Fix and Improve: show user data 2019-08-24 01:09:56 +09:00
Cutls
c656bc4bb6 Fix: toggle actions of toots 2019-08-24 01:09:40 +09:00
Cutls
025b60e564 README 2019-08-24 01:09:20 +09:00
Cutls
1e86964d8f Update issue templates 2019-08-23 02:54:29 +09:00
Cutls
61d4d7005e Fix: #108 NowPlaying of iTunes on macOS 2019-08-23 02:00:22 +09:00
Cutls
d0ed9faf50 TheDesk Usamin (18.8.2) 2019-08-22 01:44:37 +09:00
Cutls
8ed12170de TheDesk Usamin (18.8.2) 2019-08-22 01:34:03 +09:00
Cutls
d2ba5cbe4d Fix: ugly layout when display-area is not wide 2019-08-22 01:30:05 +09:00
Cutls
6b6d3c7307 Fix: when hashtags is not lower case 2019-08-22 00:00:08 +09:00
Cutls
362b5b9c69 NSFW media->sensitive media 2019-08-21 23:07:18 +09:00
Cutls
3cde12e893 TheDesk Usain (18.8.1) 2019-08-21 21:51:36 +09:00
Cutls
d2214480f6 Fix: gray color 2019-08-21 00:36:47 +09:00
Cutls
b8bd1a8ae6 Fix CSS 2019-08-21 00:02:29 +09:00
Cutls
0bfef0c2ce Remove: log 2019-08-19 23:31:42 +09:00
Cutls
f2ce98fda5 Fix: some CSS 2019-08-19 23:27:53 +09:00
Cutls
5f08215571 Fix: muting list 2019-08-19 23:09:46 +09:00
Cutls
9567a6ddf9 Fix: emojis 2019-08-19 23:09:34 +09:00
Cutls
4416c56884 Add: show dialogs when muting and blocking 2019-08-19 22:55:50 +09:00
Cutls
68328a9449 Fix: Fontawesome 2019-08-14 02:49:51 +09:00
Cutls
141f2a3f39 Change: CDN 2019-08-14 02:36:01 +09:00
Cutls
7bbca06033 Add: FOSSA 2019-08-14 02:14:34 +09:00
Cutls
ebb72265b9 package.json update 2019-08-14 01:47:21 +09:00
Cutls
c98f433da6 Delete assets 2019-08-14 01:35:01 +09:00
Cutls
2346ef7089 Remove: NowPlaying on Windows 2019-08-14 01:23:25 +09:00
Cutls
8aac6474da TheDesk Usamin (18.8.0) 2019-08-14 00:53:36 +09:00
Cutls
ffcecf38c8 Add: Change: live column add and remove 2019-08-14 00:40:21 +09:00
Cutls
77342206b1 Add: reload this column 2019-08-14 00:25:58 +09:00
Cutls
b6a44e7a7c Fix: vote display refresh 2019-08-14 00:24:11 +09:00
Cutls
e138d357c7 Remove: /follows 2019-08-14 00:23:34 +09:00
Cutls
66645982e9 Fix: arrow key img selector(reversed) 2019-08-14 00:23:05 +09:00
Cutls
4347f55077 Speed up 2019-08-11 02:52:32 +09:00
Cutls
ab9d45c775 Update: CSS about #InstanceTicker 2019-08-11 00:12:11 +09:00
Cutls
9c0c662f25 Update: icons 2019-08-09 10:58:55 +09:00
Cutls
63abdb2d53 Add: Liberapay 2019-08-08 02:06:13 +09:00
Cutls
47e2693368 Fix: about blue theme 2019-08-08 01:55:47 +09:00
Cutls
b909cbe666 Introduce: TheDesk notice v2 2019-08-07 23:27:00 +09:00
Cutls
95f5ce13ba Add: detecting languages[de/cs/bg] 2019-08-07 23:14:20 +09:00
Cutls
fed1496e68 Update: de and Change: algo of locale 2019-08-07 12:14:07 +09:00
Cutls
da6993730c Add: bg/cs/de locales 2019-08-07 09:24:52 +09:00
Cutls
0a1d462ace Add: trending tags 2019-08-06 23:06:09 +09:00
Cutls
1387482db0 TheDesk Usamin (18.7.1) 2019-08-02 00:02:52 +09:00
Cutls
b7a86324dd Merge pull request #105 from cutls/dependabot/npm_and_yarn/app/readline-sync-1.4.10
Update readline-sync requirement from 1.4.9 to 1.4.10 in /app
2019-08-01 22:56:12 +09:00
Cutls
babc5a6424 Merge pull request #107 from cutls/dependabot/npm_and_yarn/app/electron-tw-6.0.0
Update electron requirement from ^5.0.4 to ^6.0.0 in /app
2019-08-01 22:55:31 +09:00
dependabot-preview[bot]
74a468383c Update electron requirement from ^5.0.4 to ^6.0.0 in /app
Updates the requirements on [electron](https://github.com/electron/electron) to permit the latest version.
- [Release notes](https://github.com/electron/electron/releases)
- [Commits](https://github.com/electron/electron/compare/v5.0.4...v6.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-31 20:26:05 +00:00
dependabot-preview[bot]
3a48f0ff0d Update readline-sync requirement from 1.4.9 to 1.4.10 in /app
Updates the requirements on [readline-sync](https://github.com/anseki/readline-sync) to permit the latest version.
- [Release notes](https://github.com/anseki/readline-sync/releases)
- [Commits](https://github.com/anseki/readline-sync/compare/1.4.9...1.4.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-29 20:25:25 +00:00
Cutls
e26363adf6 Fix: when open an image modal, disabled toot selector 2019-07-29 01:13:53 +09:00
Cutls
35d97d42c5 Fix: context func is pollted 2019-07-29 01:09:12 +09:00
Cutls
4fa7d07500 Improve: sorting 2019-07-29 00:52:12 +09:00
Cutls
15f428528b Add: video loop(on modal and Pleroma) and autoplay on modal 2019-07-29 00:42:52 +09:00
Cutls
7fa805fe3a Change: sort suggest 2019-07-29 00:42:17 +09:00
Cutls
fd9c97a126 Add: tag suggest with v2 2019-07-29 00:16:49 +09:00
Cutls
f081154804 init 2019-07-28 23:48:44 +09:00
Cutls
866affdf45 Add: mute by emoji(custom/default) 2019-07-28 23:47:50 +09:00
Cutls
30aee556f1 Fix: if account is null #102 2019-07-25 23:55:25 +09:00
Cutls
b12c18aa08 Add: NSFW warning when not blurhashed sensitive toots 2019-07-25 23:52:44 +09:00
Cutls
f17a47d088 Change: NSFW images on not blurhash supported instance 2019-07-25 23:20:38 +09:00
Cutls
d79f096749 Merge pull request #104 from cutls/dependabot/npm_and_yarn/app/electron-builder-tw-21.1.5
Update electron-builder requirement from ^20.44.4 to ^21.1.5 in /app
2019-07-25 23:16:23 +09:00
dependabot-preview[bot]
5b82b91c6a Update electron-builder requirement from ^20.44.4 to ^21.1.5 in /app
Updates the requirements on [electron-builder](https://github.com/electron-userland/electron-builder) to permit the latest version.
- [Release notes](https://github.com/electron-userland/electron-builder/releases)
- [Changelog](https://github.com/electron-userland/electron-builder/blob/master/CHANGELOG.md)
- [Commits](https://github.com/electron-userland/electron-builder/compare/v20.44.4...v21.1.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-24 20:25:27 +00:00
Cutls
4a6b87ac1c Fix: emoji-including URL 2019-07-15 00:56:19 +09:00
Cutls
1bea06354e TheDesk Usamin (18.7.0) 2019-07-13 00:01:16 +09:00
Cutls
5fbd5aaf10 Fix: layout 2019-07-13 00:01:09 +09:00
Cutls
0290a6d918 shortcut key desc 2019-07-13 00:00:26 +09:00
Cutls
2576c48441 Pleroma URL 2019-07-12 23:16:27 +09:00
Cutls
eb02dd2986 Fix: when failed to upload 2019-07-12 01:01:24 +09:00
Cutls
d92570fa3b Add: keyboard-control 2019-07-12 00:53:55 +09:00
Cutls
38c988d2a2 Fix: desc hidden 2019-07-10 22:48:36 +09:00
Cutls
0927282d41 Change: overflow of column name 2019-07-09 22:48:57 +09:00
Cutls
5ffd59619c TheDesk Usamin (18.6.7) 2019-07-09 00:35:33 +09:00
Cutls
a739926ad4 sub-button color 2019-07-09 00:35:20 +09:00
Cutls
e41c38f41d Change: remove get card API 2019-07-09 00:27:31 +09:00
Cutls
2de05b84aa Misskey streaming leak 2019-07-09 00:27:18 +09:00
Cutls
0e9bdef9ca Add: set main account on showOnTL 2019-07-06 23:16:41 +09:00
Cutls
8e70e005c1 TheDesk Usamin (18.6.6) 2019-07-02 00:37:58 +09:00
Cutls
3817dbc925 Some bugs about Vue 2019-07-02 00:32:28 +09:00
Cutls
63ec669c52 boost-btn 2019-07-02 00:32:06 +09:00
Cutls
afc5702796 boost-btn 2019-07-02 00:31:54 +09:00
Cutls
41ec66b58a Add theme: [渚の花嫁] 新田美波 2019-07-02 00:31:44 +09:00
Cutls
936d3ca7fc Change: flexible color of toot-btn 2019-07-02 00:31:08 +09:00
Cutls
f8b4b7b74d Change: unboostable toot btn(hidden to unvisible) 2019-07-02 00:26:41 +09:00
Cutls
bd865977b0 Remove: best-friends.chat from TheDesk support instance 2019-07-01 23:19:47 +09:00
Cutls
d056db5617 Do not ... on translate results #96 2019-07-01 21:46:00 +09:00
Cutls
7685677ada Merge branch 'master' of https://github.com/cutls/TheDesk 2019-07-01 21:40:46 +09:00
Cutls
eb0aa81492 Remove knzk.me from support instances 2019-07-01 21:40:28 +09:00
Cutls
dc52531f28 Merge pull request #99 from kPherox/update-kpherox-links
Update kPherox's links
2019-06-29 16:22:34 +09:00
kPherox
5a20034b9f Update kPherox's links 2019-06-29 16:11:52 +09:00
Cutls
5cd0ef0d8a Update README 2019-06-27 23:17:07 +09:00
313 changed files with 45819 additions and 22906 deletions

View File

@@ -0,0 +1,27 @@
---
name: Bug report English
about: Create a report to help us improve
title: ''
labels: "\U0001F41Bbug"
assignees: ''
---
Describe the bug: a clear and concise description of what the bug is.
**To Reproduce**
Steps to reproduce the behavior:
1. Click on '....'
2. See error
**Expected behavior**
A clear and concise description of what you expected to happen.
**Environment**
- OS: [e.g. macOS High Sierra , Windows 10 Pro 1903, Ubuntu 19.04]
- Version: [e.g. Usamin (18.0.0)]
Check at 'Application,' 'About TheDesk' at top of the window.
- Your instance: [e.g. mastodon.social]
**Additional context**
Add any other context about the problem here.

View File

@@ -0,0 +1,27 @@
---
name: Bug report Japanese(日本語のバグ報告)
about: 迅速なバグ撲滅のために
title: ''
labels: "\U0001F41Bbug"
assignees: ''
---
バグの簡単な説明を最初に入れます。
**再現方法**
このようにするとバグが発生しました。
1. '....'をクリックすると
2. エラーが出ます
**本来の挙動**
本来どのように動くのが望ましいかを記入
**環境**
- OS: [例 macOS High Sierra , Windows 10 Pro 1903, Ubuntu 19.04]
- バージョン: [例 Usamin (18.0.0)]
TheDesk画面上部の「アプリケーション」から「TheDeskについて」で確認
- インスタンス: [例. mastodon.social]
**追記**
追記

12
.gitignore vendored
View File

@@ -12,4 +12,14 @@ enq.md
app/.tkn
app/node_modules
app/js/login/tkn.js
app/package-lock.json
app/view/en
app/view/ja
app/view/ja-KS
app/view/de
app/view/bg
app/view/cs
app/view/ps
app/view/es-AR
app/git
*.code-workspace
releasenote.md

View File

@@ -3,20 +3,26 @@ os:
- linux
- osx
language: node_js
env:
- YARN_GPG=no
node_js:
- '10.15.2'
cache:
yarn: true
script: node -v
before_deploy:
- npm install electron-builder -g
- yarn global add electron-builder
- cd app
- VERSION=$(cat package.json | grep version | head -1 | awk -F= "{ print $2 }" | sed 's/[version:,\",]//g' | tr -d '[[:space:]]')
- npm install
- yarn install --no-lockfile --prod
- yarn construct
- if [ "$TRAVIS_OS_NAME" = "osx" ];then electron-builder --mac -p never;else :;fi
- if [ "$TRAVIS_OS_NAME" = "linux" ];then electron-builder --linux --x64 -p never;else :;fi
- if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../build;else :;fi
- if [ "$TRAVIS_OS_NAME" = "linux" ];then ls;else :;fi
- if [ "$TRAVIS_OS_NAME" = "linux" ];then mv thedesk-*.zip thedesk.zip;else :;fi
- if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../app;else :;fi
- if [ "$TRAVIS_OS_NAME" = "windows" ];then yarn add electron-builder;else :;fi
- if [ "$TRAVIS_OS_NAME" = "windows" ];then electron-builder --win --ia32 -p never;else :;fi
- if [ "$TRAVIS_OS_NAME" = "windows" ];then cd ../build;else :;fi
- if [ "$TRAVIS_OS_NAME" = "windows" ];then ls;else :;fi
@@ -44,4 +50,5 @@ deploy:
on:
repo: cutls/TheDesk
tags: true
all_branches: true
branches:
only: "/^v?[0-9\\.]+/"

View File

@@ -1,22 +0,0 @@
## For Astarte(kirishima.cloud), My Primary Instance
TheDesk :thedesk: Akane (16.1.0)
・不具合修正(マウスオーバー,クリックに関する)
・2.5.0に対する対応(リプ数やendorseなど)
・軽量化を図った
・一つのカラムをTwitter(TweetDeck)にできる機能
・画像の保存先を変えられるように
・インスタンス情報の拡充
・デザイン変更
・トゥートバーを左端に持ってこれるように
・Windowsのネイティブ通知が復活
ほか
https://thedesk.top
:github: https://github.com/cutls/TheDesk #Desk #DeskUpdate
## For Other Instances
TheDesk :thedesk: Akane (16.0.1)
https://thedesk.top

View File

@@ -1,8 +0,0 @@
# プライバシーポリシー
* TheDeskは「開発者からのお知らせ」配信のためにサーバー(thedesk.top)に常時アクセスしています。
* 上記の接続によるユーザーの情報提供はありません。(IPアドレス等を含む)
* thedesk.topのページにおいては、Googleアナリティクスによる解析を採用しています。
* 配信についてAmazon Web Service CloudFrontを使用しています。CloudFrontにはアクセス解析機能がありますが、これの使用につきましては同プライバシーポリシーに則ります。
* 接続するインスタンスのプライバシーポリシーはAPIを通じた全てのアクションに対して有効ですので、TheDeskについてもそれらに則ります。

View File

@@ -5,8 +5,8 @@
[![Build Status](https://travis-ci.org/cutls/TheDesk.svg?branch=master)](https://travis-ci.org/cutls/TheDesk)
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/thedesk/localized.svg)](https://translate.thedesk.top/project/thedesk)
[![FOSSA Status](https://bit.ly/2N4cLd1)](https://bit.ly/31zqMmZ)
[![Version](https://flat.badgen.net/github/release/cutls/TheDesk)](https://github.com/cutls/TheDesk/releases)
[![Download](https://flat.badgen.net/github/assets-dl/cutls/TheDesk)](https://github.com/cutls/TheDesk/releases)
![Contributors](https://flat.badgen.net/github/contributors/cutls/TheDesk)
Mastodon/Misskey client for PC(Windows/Linux/macOS)
オープンソースSNSマストドン/MisskeyのPC向けクライアント[日本語はこちら](README_ja.md)
@@ -14,6 +14,7 @@ Mastodon/Misskey client for PC(Windows/Linux/macOS)
Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge/?site=thedesk.top)](https://status.cutls.com)
<a href="https://www.patreon.com/cutls"><img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" alt="Become a Patron!" width="160"></a>
<a href="https://liberapay.com/cutls/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg"></a>
![Screenshots1](https://thedesk.top/img/scr1.png)
## License
@@ -21,12 +22,13 @@ Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge
[GNU General Public License v3.0](https://github.com/cutls/TheDesk/blob/master/LICENSE)
The icon is provided under [Creative Commons BY-NC-SA](https://creativecommons.org/licenses/by-nc-sa/4.0/)
[Press Kit](https://dl.thedesk.top/press/TheDesk+PressKit.zip)
[Press Kit](https://d2upiril6ywqp9.cloudfront.net/press/TheDesk+PressKit.zip)
* [PNG](https://dl.thedesk.top/press/TheDesk.png)
* [Monotone SVG](https://dl.thedesk.top/press/TheDesk.svg)
* [ico](https://dl.thedesk.top/press/TheDesk.ico)
* [icns](https://dl.thedesk.top/press/TheDesk.icns)
* [PNG 512x512](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.png)
* [SVG 4095x4096](https://d2upiril6ywqp9.cloudfront.net/press/thedesk-fullcolor.svg)
* [ico 256x256](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ico)
* [icns old](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.icns)
* [Illustrator .ai](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ai)
The default sounds of notifications is provided [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/)
@@ -39,6 +41,7 @@ The default sounds of notifications is provided [Creative Commons BY](https://cr
* 日本語(Japanese)
* English
* de, cs, bg(from Crowdin)
### Translation
@@ -73,19 +76,41 @@ Build for Linux
Fellow coder
* [kPherox](https://www.kr-kp.com/)
* [kPherox](https://pl.kpherox.dev/kPherox)
## Build
You have to use either **npm** or **yarn**. Whichever you use, it works well.
### npm
```sh
git clone https://github.com/cutls/TheDesk
cd TheDesk/app
npm install
npm install --only=dev
npm run construct
```
### yarn
```sh
git clone https://github.com/cutls/TheDesk
cd TheDesk/app
# Linux or macOS
yarn install --no-lockfile
# Windows
yarn install
yarn construct
```
run `npm run dev` or `yarn dev` to launch developer version with console(click `view`)
### electron-builder(Recommended)
Use npm scripts.
Use scripts(they can work well with npm, **yarn**).
#### npm
```sh
# Build for current platform
@@ -99,6 +124,21 @@ npm run build:win
npm run build:all
```
#### yarn
```sh
# Build for current platform
yarn build
# Select build target
## Windows
yarn build:win
## Windows and Linux (The macOS target should run on macOS. So, this option hasn't include the build for macOS)
yarn build:all
```
Config is all on package.json
### electron-packager
@@ -123,4 +163,9 @@ macOS
Did you find a bug with Pleroma accounts?
Pleroma **does not** follow Mastodon API rules completely although Pleroma developers say so.
Please write issues to improve TheDesk affinity with Pleroma.
Please write issues to improve TheDesk affinity with Pleroma.
## Vulnerabilities when `npm i`???
No, if your npm says materialize-css has vulnerabilities(CVE-2019-11002/3/4), look at [here](https://github.com/Dogfalo/materialize/issues/6286) under discussion.

View File

@@ -5,8 +5,8 @@
[![Build Status](https://travis-ci.org/cutls/TheDesk.svg?branch=master)](https://travis-ci.org/cutls/TheDesk)
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/thedesk/localized.svg)](https://translate.thedesk.top/project/thedesk)
[![FOSSA Status](https://bit.ly/2N4cLd1)](https://bit.ly/31zqMmZ)
[![Version](https://flat.badgen.net/github/release/cutls/TheDesk)](https://github.com/cutls/TheDesk/releases)
[![Download](https://flat.badgen.net/github/assets-dl/cutls/TheDesk)](https://github.com/cutls/TheDesk/releases)
![Contributors](https://flat.badgen.net/github/contributors/cutls/TheDesk)
Mastodon/Misskey client for PC(Windows/Linux/macOS)
オープンソースSNSマストドン/MisskeyのPC向けクライアント
@@ -21,12 +21,13 @@ Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge
[GNU General Public License v3.0](https://github.com/cutls/TheDesk/blob/master/LICENSE)
アイコンは[クリエイティブ・コモンズ 表示-非営利-継承](https://creativecommons.org/licenses/by-nc-sa/4.0/)で提供されています。
[プレスキット](https://dl.thedesk.top/press/TheDesk+PressKit.zip)
[プレスキット](https://d2upiril6ywqp9.cloudfront.net/press/TheDesk+PressKit.zip)
* [PNG](https://dl.thedesk.top/press/TheDesk.png)
* [Monotone SVG](https://dl.thedesk.top/press/TheDesk.svg)
* [ico](https://dl.thedesk.top/press/TheDesk.ico)
* [icns](https://dl.thedesk.top/press/TheDesk.icns)
* [PNG 512x512](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.png)
* [SVG 4095x4096](https://d2upiril6ywqp9.cloudfront.net/press/thedesk-fullcolor.svg)
* [ico 256x256](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ico)
* [icns old](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.icns)
* [Illustrator .ai](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ai)
標準の通知音は [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/) で提供されています。
@@ -39,6 +40,7 @@ Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge
* 日本語
* English(英語)
* ドイツ語, チェコ語, ブルガリア語(from Crowdin)
### 翻訳
@@ -71,22 +73,42 @@ Linuxビルダー
* [ぽぷんじゃ](https://popon.pptdn.jp/@popn_ja)
iTunes NowPlayingにアルバムアートワークを付けてくれた人
コーダー
* [kPherox](https://www.kr-kp.com/)
* [kPherox](https://pl.kpherox.dev/kPherox)
## ビルド
npmでもyarnでも好きな方を選んでください。
### npm
```sh
git clone https://github.com/cutls/TheDesk
cd TheDesk/app
npm install
npm install --only=dev
npm run construct
```
### yarn
```sh
git clone https://github.com/cutls/TheDesk
cd TheDesk/app
# Linux or macOS
yarn install --no-lockfile
# Windows
yarn install
yarn construct
```
### electron-builder(推奨)
npm scriptsを利用します
scriptsを利用します
#### npm
```sh
# 実行している環境向けにビルド
@@ -100,6 +122,20 @@ npm run build:win
npm run build:all
```
#### yarn
```sh
# 実行している環境向けにビルド
yarn build
# ターゲットを指定してビルド
## Windows
yarn build:win
## macOS向けのビルドにはmacOSで実行する必要があるためこのコマンドではビルドされません
yarn build:all
```
ビルド設定はすべてpackage.jsonに記載しています。
### electron-packager(非推奨)
@@ -130,3 +166,8 @@ Issuesに書いてある問題についてはなるべく対処しますので
## 詳しく
[TheDesk - マストドン日本語ウィキ](https://ja.mstdn.wiki/TheDesk)
## `npm i`したら脆弱性あるって言われた
materialize-cssの脆弱性(CVE-2019-11002/3/4)については[こちら](https://github.com/Dogfalo/materialize/issues/6286)で本当に脆弱性かどうか議論しています。
実際には害が無いものと思われます。

View File

@@ -15,6 +15,8 @@
font-family: 'Open Sans';
-webkit-app-region: drag;
cursor: move;
padding: 5px;
padding-top: 15px;
}
a,
@@ -27,7 +29,7 @@
display: grid;
grid-template-columns: 1fr 1fr;
grid-template-rows: 1fr 1fr 1fr 1fr 1fr;
grid-template-areas: 'name1 data1''name2 data2''name3 data3''name4 data4''name5 data5';
grid-template-areas: 'name1 data1''name2 data2''name3 data3''name4 data4''name5 data5''name6 data6';
text-align: left;
margin: 5px;
}
@@ -71,6 +73,14 @@
.area-data5 {
grid-area: data5;
}
.area-name6 {
grid-area: name6;
}
.area-data6 {
grid-area: data6;
}
</style>
</head>
@@ -78,24 +88,26 @@
<script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
<script type="text/javascript" src="./js/platform/first-not-view.js"></script>
<script type="text/javascript" src="./node_modules/materialize-css/dist/js/materialize.js"></script>
<img src="./img/desk.png" style="max-width:62%;">
<img src="./img/desk.svg" style="max-width:62%;">
<h5>TheDesk</h5>
<div class="container">
<div class="area-name1">Display version</div>
<div class="area-data1" id="now"></div>
<div class="area-name2">Internal version</div>
<div class="area-data2" id="ver"></div>
<div class="area-name3">Chromium</div>
<div class="area-data3" id="chrome"></div>
<div class="area-name4">Electron</div>
<div class="area-data4" id="electron"></div>
<div class="area-name5">Node.js</div>
<div class="area-data5" id="node"></div>
<div class="area-name3">Commit(7chars)</div>
<div class="area-data3" id="hash"></div>
<div class="area-name4">Chromium</div>
<div class="area-data4" id="chrome"></div>
<div class="area-name5">Electron</div>
<div class="area-data5" id="electron"></div>
<div class="area-name6">Node.js</div>
<div class="area-data6" id="node"></div>
</div>
<div class="cp">Copyright &copy; TheDesk 2018<br>
Main developer(author): <a href="https://cutls.com/@Cutls" target="_blank">Cutls P</a><br>
Thanks:<a href="https://minohdon.jp/@toneji" target="_blank">toneji</a>/<a
href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a href="https://pawoo.net/@kPherox"
href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a href="https://pl.kpherox.dev/kPherox"
target="_blank">kPherox</a> and all users
<img draggable="false" style="width:0.8rem;top: 1px;margin-left: 1px;position: relative;" alt="❤️"
title=":heart:" src="https://twemoji.maxcdn.com/2/72x72/2764.png">
@@ -114,6 +126,7 @@
var ver = m[1];
$("#ver").text(ver);
}
$("#hash").html('<a href="https://github.com/cutls/TheDesk/commits/' + about[3] + '" target="_blank">' + about[3].slice(0, 7) + '</a>');
$(document).on('click', 'a', e => {
var url = $(e.target).attr('href');
postMessage(["openUrl", url], "*")

BIN
app/build/thedesk.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

76
app/css/acct.css Normal file
View File

@@ -0,0 +1,76 @@
.acct {
display: flex;
justify-content: space-around;
}
.card {
width: 400px;
background-color: #494949;
margin: 10px;
}
body,
html {
overflow-y: scroll;
}
#acct-list {
display: flex;
flex-wrap: wrap;
color: white;
align-items: flex-start;
}
.lts {
font-size: 150%;
}
.colorsel {
display: flex;
}
.card .colorsel div:not(.exc) {
width: 20px;
height: 20px;
}
.card .colorsel div.exc {
width: 40px;
height: 20px;
}
.first {
display: flex;
justify-content: center;
align-items: center;
}
.first .hide-first {
display: none;
}
#compt {
margin-top: 20px;
margin-bottom: 50px;
border: 1px solid;
border: 1px solid;
padding: 5px;
}
#compt li {
list-style-type: disc;
margin-left: 20px;
}
#domain-list {
width: 500px;
max-width: 100%;
}
i.left {
margin-right: 5px;
}
#domain-list .title {
font-size: 1.3rem;
}

View File

@@ -7,12 +7,8 @@ body {
cursor: default;
font-size: 13px;
height: 100vh;
background-color: var(--bg);
color: var(--color);
}
body {
border: thin solid gray;
}
.btn {
margin: 5px;
text-transform: none;
@@ -76,6 +72,9 @@ option {
min-width: 0 !important;
margin-left: 5px !important;
}
.unvisible {
opacity: 0;
}
.bbcode-pulse-loadings,
.bbcode-pulse-loading,
.fa-pulse {
@@ -181,26 +180,6 @@ blockquote:before,
right: 0;
top: 0;
}
.twitter-tweet {
color: black;
background-color: #fff;
padding: 1em 1em 1em;
position: relative;
border-top-left-radius: 10px;
border-bottom-right-radius: 10px;
border-bottom-left-radius: 10px;
border-left: 5px solid #0c7abf;
}
.twitter-tweet :before {
content: "From Twitter";
font-size: 1.8rem;
line-height: 1em;
font-family: Open Sans;
color: #999;
position: absolute;
right: 0;
top: 0;
}
.pixiv-post {
color: black;
background-color: #fff;
@@ -221,6 +200,17 @@ blockquote:before,
right: 0;
top: 0;
}
#start {
display: none;
position: fixed;
width: 100vw;
height: calc(100vh - 40px);
background-color: var(--bg);
color: var(--color);
z-index: 99999;
justify-content: center;
align-items: center;
}
#drag {
display: none;
position: fixed;
@@ -235,9 +225,6 @@ blockquote:before,
#drag-content {
font-size: 2rem;
}
.radio {
font-family: "Baloo Bhai";
}
#pip {
z-index: 504;
width: 418px;
@@ -304,6 +291,9 @@ blockquote:before,
.tabs {
background-color: var(--subcolor);
}
.collapsible-header:focus {
background-color: var(--subcolor) !important;
}
.modal-footer {
background-color: var(--modalfooter) !important;
}
@@ -326,20 +316,23 @@ blockquote:before,
#menu {
position: fixed;
z-index: 9999;
background-color: var(--box);
background-color: var(--postbox);
width: 540px;
top: calc(50% - 150px);
left: calc(50% - 250px);
padding: 5px;
border: thin solid gray;
border-radius: 5px;
overflow: hidden;
}
#menu-wrapper {
margin-left: -5px;
display: flex;
height: calc(100% - 3.5rem);
overflow: hidden;
}
#left-menu {
width: 170px;
width: 230px;
}
#left-menu div {
padding-left: 5px;
@@ -359,8 +352,7 @@ blockquote:before,
background-color: var(--emphasized);
}
#right-menu {
width: 380px;
max-height: 375px;
width: 100%;
overflow-y: scroll;
overflow-x: hidden;
padding: 5px;
@@ -377,6 +369,9 @@ blockquote:before,
height: 40px;
cursor: pointer;
}
#tltype .type span {
width: calc(100% - 30px);
}
#tltype .type:hover {
background-color: var(--beforehover);
}
@@ -388,16 +383,19 @@ blockquote:before,
}
#tltype i.sub-icon {
font-size: 20px;
position: relative;
position: absolute;
color: var(--beforehover);
left: -15px;
left: 10px;
bottom: 5px;
background-color: #fff;
}
.drag-bar {
cursor: move;
text-align: center;
width: calc(100% + 10px);
border-radius: 5px;
background-color: var(--bg);
background-color: var(--box);
filter: brightness(80%);
margin-left: -5px;
margin-right: -5px;
margin-top: -5px;
@@ -441,17 +439,57 @@ blockquote:before,
.select-wrapper .dropdown-content {
width: 250px !important;
}
input, textarea {
input,
textarea {
color: var(--color);
font-size: 1rem !important;
font-family: inherit;
}
.swal2-popup{
.swal2-popup {
background-color: var(--notfbox) !important;
}
.swal2-title, .swal2-content{
.swal2-title,
.swal2-content {
color: var(--color) !important;
}
#src-contents svg {
margin-right: 5px;
}
.contributor {
cursor: pointer;
}
.contributor img {
width: 1rem;
}
.tagComp{
display: grid;
grid-template-columns: 60px 80px 1fr;
grid-template-rows: 1fr 1fr;
grid-template-areas: "svg toot user" "svg toot tag" "svg toots tag";
border-top: dotted 0.5px var(--gray);
padding: 5px
}
.tagCompSvg {
grid-area: svg;
}
.tagCompToot {
grid-area: toot;
text-align: center;
}
.tagCompToots {
grid-area: toots;
text-align: center;
}
.tagCompUser {
grid-area: user;
}
.tagCompTag {
grid-area: tag;
padding-top: 10px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
/*スクロールバー*/
::-webkit-scrollbar {
@@ -470,3 +508,37 @@ input, textarea {
background: #607d8b;
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
}
/* Web Fonts */
@font-face {
font-family: "Open Sans";
font-style: normal;
font-weight: 300;
src: local("Open Sans Light"), local("OpenSans-Light"),
url(https://fonts.gstatic.com/s/opensans/v17/mem5YaGs126MiZpBA-UN_r8OUuhp.woff2)
format("woff2");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215,
U+FEFF, U+FFFD;
}
@font-face {
font-family: "Material Icons";
font-style: normal;
font-weight: 400;
src: url(https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2)
format("woff2");
}
.material-icons {
font-family: "Material Icons";
font-weight: normal;
font-style: normal;
font-size: 24px;
line-height: 1;
letter-spacing: normal;
text-transform: none;
display: inline-block;
white-space: nowrap;
word-wrap: normal;
direction: ltr;
-webkit-font-feature-settings: "liga";
-webkit-font-smoothing: antialiased;
}

View File

@@ -7,15 +7,18 @@
background-color: var(--postbox);
border: thin solid gray;
z-index: 501;
min-width: 300px;
max-width: 100%;
padding: 5px;
border-radius: 5px;
overflow: hidden;
}
textarea{
textarea {
min-height: 100px !important;
font-family: inherit;
}
#post-box .ui-resizable-s, #post-box .ui-resizable-se{
display: none !important;
}
.cancel {
font-size: 0.5rem;
@@ -108,23 +111,20 @@ textarea{
}
#left-side {
float: left;
width: 300px;
overflow-x: hidden;
height: calc(100% - 32px);
}
#right-side {
display: none;
float: left;
width: 300px;
padding: 5px;
overflow-x: hidden;
height: calc(100% - 32px);
}
#poll {
#posttgl,#toot-post-btn {
background-color: var(--accentbtn);
}
.poll-provider {
position: absolute;
height: calc(100% - 90px);
overflow-y: scroll;
top: 90px;
}
/*mini*/
.mini-post .mize {
display: none !important;

View File

@@ -14,6 +14,10 @@
--active: #e6ee9c;
--postbox: white;
--modalfooter: #fafafa;
--accentbtn: #009688;
--selected: #c0c0c0;
--selectedWithShare: #b2babd;
--gray: #757575;
}
#imagemodal {
background: url("../img/pixel.white.svg");
@@ -34,6 +38,10 @@
--active: #757575;
--postbox: #424242;
--modalfooter: #212121;
--accentbtn: #3f51b5;
--selected: #3f3f3f;
--selectedWithShare: #003a30;
--gray: #cccccc;
}
.blacktheme #imagemodal {
background: url("../img/pixel.svg");
@@ -54,6 +62,10 @@
--active: #757575;
--postbox: #1a237e;
--modalfooter: #031833;
--accentbtn: #00acc1;
--selected: #214f8a;
--selectedWithShare: #003a30;
--gray: #cccccc ;
}
.indigotheme #imagemodal {
background: url("../img/pixel.svg");
@@ -74,6 +86,10 @@
--active: #757575;
--postbox: #4e342e;
--modalfooter: #261411;
--accentbtn: #827717;
--selected: #6d352b;
--selectedWithShare: #003a30;
--gray: #cccccc;
}
.browntheme #imagemodal {
background: url("../img/pixel.svg");
@@ -86,7 +102,7 @@
--modal: #81c784;
--subcolor: #a5d6a7;
--box: #81c784;
--sidebar: #81c784;
--sidebar: #c5e1a5;
--shared: #ffcc80;
--notfbox: #a5d6a7;
--emphasized: #9e9d24;
@@ -94,7 +110,35 @@
--active: #e6ee9c;
--postbox: #a5d6a7;
--modalfooter: #81c784;
--accentbtn: #33691e;
--selected: #78c17a;
--selectedWithShare: #caa266;
--gray: #757575;
}
.greentheme #imagemodal {
background: url("../img/pixel.white.svg");
}
.bluetheme {
--bg: #c9e1ec;
--drag: rgba(255, 255, 255, 0.8);
--color: black;
--beforehover: #757575;
--modal: #b2ebf2;
--subcolor: #90caf9;
--box: #90caf9;
--sidebar: #b6e6f5;
--shared: #e0ffe4;
--notfbox: #90caf9;
--emphasized: #c5e1a5;
--his-data: rgba(255, 255, 255, 0.9);
--active: #b39ddb;
--postbox: #dff1ff;
--modalfooter: #2196f3;
--accentbtn: #2f7bb7;
--selected: #9dcade;
--selectedWithShare: #c1dac4;
--gray: #757575;
}
.bluetheme #imagemodal {
background: url("../img/pixel.white.svg");
}

File diff suppressed because it is too large Load Diff

View File

@@ -4,6 +4,13 @@
background-image: url("../../loading.svg");
overflow-y: hidden;
}
#his-data .btn .material-icons{
float:left;
}
#his-data-content {
display: flex;
justify-content: center;
}
#his-name {
font-size: 1.5rem;
}
@@ -13,16 +20,18 @@
margin-right: 5px;
}
.his-float {
float: left;
overflow-y: scroll;
padding: 5px;
}
#his-float-data {
width: 400px;
height: 100%;
overflow-y: hidden;
}
#his-leftside {
width: 500px;
}
#his-float-timeline {
width: calc(100% - 400px);
max-width: 775px;
height: 100%;
overflow-y: hidden;
}
@@ -55,27 +64,36 @@
padding: 0;
padding-left: 5px;
}
#his-data a span.ellipsis:after {
.his-var-content a span.ellipsis:after {
content: "...";
}
#his-data a:not(.mention) span:last-of-type {
.his-var-content a:not(.mention) span:last-of-type {
display: none;
}
#his-data a .rep_ct,
#his-data a .rt_ct,
#his-data a .fav_ct {
display: inline !important;
}
#his-data-show {
margin: 20px;
margin-left: 50px;
margin-right: 50px;
background-color: var(--his-data);
width: calc(100% - 20px);
height: calc(100% - 20px);
margin-bottom: 0;
padding: 5px;
}
.tab-content {
#his-data-wrap {
display: flex;
}
.his-var-content {
overflow-y: scroll;
overflow-x: hidden;
height: calc(100% - 240px);
height: calc(100% - 45px);
}
.my-data-width {
width: 10%;
#my-data-nav .btn {
width: 140px;
}
.active-back {
background-color: var(--active);
@@ -85,7 +103,8 @@
width: 20px;
}
#his-plus-action .btn {
width: 170px;
padding-right: 5px;
padding-left: 5px;
}
.tabs {
display: flex;
@@ -93,16 +112,40 @@
.tabs .tab a {
padding: 8px 12px;
}
#his-des {
max-height: 250px;
overflow-y: scroll;
}
#his-sign-action {
border: 1px solid;
border-radius: 5px;
display: flex;
align-items: center;
padding-left: 10px;
padding-right: 10px;
flex-wrap: wrap;
}
#his-sign-action .btn {
flex-basis: 31.2%;
}
#his-des .mention {
color: #039be5;
cursor: pointer;
}
#his-table{
max-height: 150px;
overflow-y: scroll;
}
#his-float-blocked {
display: flex;
justify-content: center;
align-items: center;
font-size: 2rem;
width: 90%;
height: 100%;
position: absolute;
}
#hisdropdown{
background-color: var(--bg);
}
#hisdropdown li:hover{
background-color: var(--active);
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 11 KiB

35
app/img/desk.svg Normal file
View File

@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">
<style type="text/css">
.st0{display:none;}
.st1{fill:#FFFFFF;}
.st2{fill:#545251;stroke:#040000;stroke-miterlimit:10;}
.st3{fill:#F0842E;}
.st4{fill:#364C9F;}
.st5{fill:#FFFFFF;stroke:#040000;stroke-miterlimit:10;}
.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#040000;}
.st7{fill-rule:evenodd;clip-rule:evenodd;fill:none;}
</style>
<g id="レイヤー_1" class="st0">
</g>
<g id="レイヤー_2">
<polyline class="st1" points="1128.5,650.67 3378,1950 3378,2137 1128.5,3432.67 "/>
<rect x="678.5" y="128.48" class="st2" width="450" height="3821.5"/>
<rect x="1915.71" y="-583.55" transform="matrix(0.5 -0.866 0.866 0.5 225.753 2341.5386)" class="st3" width="450" height="3117.62"/>
<rect x="1915.5" y="1555.41" transform="matrix(0.5 0.866 -0.866 0.5 3762.031 -299.6245)" class="st4" width="450" height="3105.58"/>
<path class="st5" d="M714.5,2953.5"/>
<path id="path1891" class="st6" d="M1592.47,2584h456.47c0-64.89-4.63-77.76-112.1-77.76c17.17-51.5,86.95-176.11,125.73-176.11
c34.31,0,75.24,1.89,75.24,80.17c0,88.87,149.56,232.16,185.82,173.7c54.04-87.12-92.91-60.55-92.91-270.65
c0-287.43,167.74-246.51,167.74-407.99c0-80.79-22.32-91.7-22.32-149.46c0-76.34,67.25-71.91,54.17-135.2
c-9.04-43.72-16.11-78.78-21.38-131.65c-3.74-37.51-4.93-77.5-43.9-75.89c-45.78,1.89-63.15,82.47-134.31,88.25
c-71.02,5.77-131.57-60.46-159.06-51c-27.25,9.38-18.68,83.32-2.52,135.83c25.4,82.54,80.79,189.86-20.2,206.02
c-100.99,16.16-274.69,32.32-399.92,197.94s-120.6,359.99-169.66,420.11C1314.72,2612.08,1146,2529.23,1146,2697.11
c0,75.16,127.35,129.27,147.55,105.03c20.2-24.24-171.62-96.46,43.01-181.78C1519.91,2547.46,1536.28,2532.58,1592.47,2584z"/>
<rect class="st7" width="4096" height="4096"/>
<path class="st1" d="M-58,1122"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

@@ -1,122 +1,35 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg xmlns="http://www.w3.org/2000/svg"
width="7.11022in" height="7.11022in"
viewBox="0 0 512 512">
<path id="選択範囲 #1"
fill="white" stroke="white" stroke-width="1"
d="M 96.00,16.00
C 99.85,16.01 102.39,15.12 104.00,19.00
104.00,19.00 97.00,19.00 97.00,19.00
97.00,19.00 108.00,22.07 108.00,22.07
108.00,22.07 144.00,43.08 144.00,43.08
144.00,43.08 181.83,64.31 181.83,64.31
181.83,64.31 223.00,88.26 223.00,88.26
223.00,88.26 247.00,102.22 247.00,102.22
247.00,102.22 257.00,107.00 257.00,107.00
260.09,110.36 266.43,114.39 271.00,115.00
271.00,115.00 298.00,133.00 298.00,133.00
298.00,133.00 300.00,132.00 300.00,132.00
300.00,132.00 312.00,141.00 312.00,141.00
312.00,141.00 314.00,140.00 314.00,140.00
318.40,144.39 334.83,152.80 341.00,156.45
341.00,156.45 404.00,192.94 404.00,192.94
404.00,192.94 425.67,205.63 425.67,205.63
428.70,208.64 426.87,211.86 425.12,215.00
425.12,215.00 412.26,237.00 412.26,237.00
410.65,240.07 409.02,245.62 404.90,245.68
401.70,245.72 396.83,242.47 394.00,240.87
394.00,240.87 370.00,226.89 370.00,226.89
370.00,226.89 282.00,176.51 282.00,176.51
282.00,176.51 271.00,169.52 271.00,169.52
271.00,169.52 261.00,164.31 261.00,164.31
257.45,162.08 251.05,157.46 247.00,157.00
247.00,157.00 234.00,148.55 234.00,148.55
234.00,148.55 208.17,133.78 208.17,133.78
208.17,133.78 190.00,124.00 190.00,124.00
190.00,124.00 163.00,107.60 163.00,107.60
163.00,107.60 103.00,73.00 103.00,73.00
103.00,73.00 103.00,453.00 103.00,453.00
103.00,453.00 127.00,439.42 127.00,439.42
127.00,439.42 170.00,414.58 170.00,414.58
170.00,414.58 237.17,376.24 237.17,376.24
237.17,376.24 256.00,364.59 256.00,364.59
256.00,364.59 264.00,360.53 264.00,360.53
264.00,360.53 285.00,348.20 285.00,348.20
285.00,348.20 292.99,344.12 292.99,344.12
292.99,344.12 299.28,339.83 299.28,339.83
299.28,339.83 320.00,328.41 320.00,328.41
320.00,328.41 362.00,304.05 362.00,304.05
362.00,304.05 371.91,297.68 371.91,297.68
371.91,297.68 379.04,294.41 379.04,294.41
379.04,294.41 410.00,276.00 410.00,276.00
410.00,276.00 416.00,285.00 416.00,285.00
416.81,288.83 421.21,296.21 424.00,299.00
424.00,299.00 423.00,301.00 423.00,301.00
427.24,303.72 430.62,312.17 432.00,317.00
432.00,317.00 388.00,342.67 388.00,342.67
388.00,342.67 317.00,383.55 317.00,383.55
317.00,383.55 279.00,405.32 279.00,405.32
279.00,405.32 264.00,415.00 264.00,415.00
264.00,415.00 262.00,414.00 262.00,414.00
262.00,414.00 250.00,423.00 250.00,423.00
250.00,423.00 248.00,422.00 248.00,422.00
248.00,422.00 238.00,428.92 238.00,428.92
238.00,428.92 218.00,440.67 218.00,440.67
218.00,440.67 207.00,448.00 207.00,448.00
207.00,448.00 193.00,455.18 193.00,455.18
193.00,455.18 176.00,465.08 176.00,465.08
176.00,465.08 166.09,470.31 166.09,470.31
166.09,470.31 137.00,487.31 137.00,487.31
137.00,487.31 103.00,506.00 103.00,506.00
103.00,506.00 104.00,509.00 104.00,509.00
104.00,509.00 57.00,509.00 57.00,509.00
57.00,509.00 57.00,16.00 57.00,16.00
57.00,16.00 96.00,16.00 96.00,16.00 Z
M 102.00,72.00
C 102.00,72.00 103.00,73.00 103.00,73.00
103.00,73.00 103.00,72.00 103.00,72.00
103.00,72.00 102.00,72.00 102.00,72.00 Z
M 261.00,190.61
C 270.30,188.63 274.03,177.15 280.77,179.78
284.36,181.18 284.28,187.65 284.72,191.00
285.35,195.85 287.64,207.99 286.57,212.00
285.51,216.00 282.42,218.30 280.78,222.00
277.54,229.29 282.79,236.85 282.99,245.00
283.38,261.24 274.02,264.52 266.36,276.00
261.36,283.50 258.58,297.05 259.09,306.00
259.91,320.41 263.09,322.38 271.02,333.00
273.09,335.77 275.09,339.39 272.11,342.37
269.94,344.63 266.39,343.51 264.00,342.37
258.40,339.52 252.76,332.51 249.91,327.00
246.61,320.60 248.26,314.37 244.57,310.23
240.72,305.90 235.19,306.50 231.18,310.23
225.69,315.34 221.16,325.22 218.00,332.00
226.04,333.96 232.79,331.61 234.00,342.00
234.00,342.00 175.00,342.00 175.00,342.00
166.62,341.85 166.77,339.11 162.00,338.56
158.39,338.15 148.72,341.68 145.00,343.05
138.31,345.53 120.54,352.22 119.64,360.00
119.01,365.49 125.06,367.91 127.00,374.00
115.41,373.03 104.20,364.93 108.88,352.00
111.36,345.12 117.06,343.57 123.00,340.75
132.86,336.05 141.94,332.38 149.58,323.96
151.40,321.95 154.62,318.26 155.92,316.00
155.92,316.00 166.03,283.00 166.03,283.00
169.87,271.08 179.16,256.26 189.00,248.52
199.37,240.36 208.38,237.36 221.00,234.66
226.45,233.50 237.77,232.36 240.99,227.79
244.55,222.75 241.98,216.26 240.34,211.00
237.46,201.77 234.64,193.69 237.00,184.00
244.82,185.47 252.94,192.32 261.00,190.61 Z
M 102.00,453.00
C 102.00,453.00 103.00,454.00 103.00,454.00
103.00,454.00 103.00,453.00 103.00,453.00
103.00,453.00 102.00,453.00 102.00,453.00 Z
M 102.00,505.00
C 102.00,505.00 103.00,506.00 103.00,506.00
103.00,506.00 103.00,505.00 103.00,505.00
103.00,505.00 102.00,505.00 102.00,505.00 Z" />
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">
<style type="text/css">
.st0{display:none;}
.st1{fill:none;}
.st2{fill:#FFFFFF;}
.st3{fill:#FFFFFF;}
.st4{fill:#FFFFFF;}
.st5{fill:#none;}
.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
.st7{fill-rule:evenodd;clip-rule:evenodd;fill:none;}
</style>
<g id="レイヤー_1" class="st0">
</g>
<g id="レイヤー_2">
<polyline class="st1" points="1128.5,650.67 3378,1950 3378,2137 1128.5,3432.67 "/>
<rect x="678.5" y="128.48" class="st2" width="450" height="3821.5"/>
<rect x="1915.71" y="-583.55" transform="matrix(0.5 -0.866 0.866 0.5 225.753 2341.5386)" class="st3" width="450" height="3117.62"/>
<rect x="1915.5" y="1555.41" transform="matrix(0.5 0.866 -0.866 0.5 3762.031 -299.6245)" class="st4" width="450" height="3105.58"/>
<path class="st5" d="M714.5,2953.5"/>
<path id="path1891" class="st6" d="M1592.47,2584h456.47c0-64.89-4.63-77.76-112.1-77.76c17.17-51.5,86.95-176.11,125.73-176.11
c34.31,0,75.24,1.89,75.24,80.17c0,88.87,149.56,232.16,185.82,173.7c54.04-87.12-92.91-60.55-92.91-270.65
c0-287.43,167.74-246.51,167.74-407.99c0-80.79-22.32-91.7-22.32-149.46c0-76.34,67.25-71.91,54.17-135.2
c-9.04-43.72-16.11-78.78-21.38-131.65c-3.74-37.51-4.93-77.5-43.9-75.89c-45.78,1.89-63.15,82.47-134.31,88.25
c-71.02,5.77-131.57-60.46-159.06-51c-27.25,9.38-18.68,83.32-2.52,135.83c25.4,82.54,80.79,189.86-20.2,206.02
c-100.99,16.16-274.69,32.32-399.92,197.94s-120.6,359.99-169.66,420.11C1314.72,2612.08,1146,2529.23,1146,2697.11
c0,75.16,127.35,129.27,147.55,105.03c20.2-24.24-171.62-96.46,43.01-181.78C1519.91,2547.46,1536.28,2532.58,1592.47,2584z"/>
<rect class="st7" width="4096" height="4096"/>
<path class="st1" d="M-58,1122"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 434 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

132
app/img/thinking.svg Normal file
View File

@@ -0,0 +1,132 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">
<style type="text/css">
.st0{fill:#040000;}
.st1{fill:#040000;stroke:#040000;stroke-miterlimit:10;}
.st2{clip-path:url(#SVGID_2_);}
.st3{clip-path:url(#SVGID_4_);}
.st4{fill:none;}
.st5{fill:#FFFFFF;}
.st6{fill:#545251;stroke:#040000;stroke-miterlimit:10;}
.st7{fill:#F0842E;}
.st8{fill:#3D4FA0;}
.st9{fill:#63451F;stroke:#FFFFFF;stroke-width:20;stroke-miterlimit:10;}
.st10{fill:#63451F;}
</style>
<g id="DrawBlack">
<polyline id="BG_1_" class="st0" points="1128.5,650.67 3378,1950 3378,2137 1128.5,3432.67 "/>
<rect id="Left_1_" x="678.5" y="128.48" class="st1" width="450" height="3821.5"/>
<rect id="Top_1_" x="1915.71" y="-583.55" transform="matrix(0.5 -0.866 0.866 0.5 225.753 2341.5386)" class="st0" width="450" height="3117.62"/>
<g id="Finger_1_">
<g>
<defs>
<rect id="SVGID_1_" x="-626.54" y="666.18" transform="matrix(0.9063 -0.4226 0.4226 0.9063 -723.8983 1097.2598)" width="5478.6" height="3030.2"/>
</defs>
<clipPath id="SVGID_2_">
<use xlink:href="#SVGID_1_" style="overflow:visible;"/>
</clipPath>
<g id="g14_3_" class="st2">
<g id="g44_1_" transform="translate(17.2764,0.8682)">
<path id="path46_1_" class="st0" d="M2605.11,3533.86c0,0,159.85-112.71,149-195.05c-10.68-85.2-127.58-48.89-127.58-48.89
s136.18-82.82,112.7-180.35c-22.17-91.83-167.38-48.54-167.38-48.54s119.56-92.9,85.39-182.75
c-28.87-75.6-188.03-44.94-188.03-44.94s651.47-417.09,718.51-459.5c66.86-42.42,160.29-131.95,87.28-198.12
c-72.76-66.37-205.83-7.85-269.88,32.69c-64.01,40.62-874.42,553.28-1153.93,730.24c-29.84,18.84-169.66,107.16-186.59,118.03
c-69.96,44.42-112.22,42.02-74.07-13.01c51.14-73.63,74.73-139.7,55.45-222.1c-20.44-86.69-114.31-161.6-159.65-186.44
c-84.35-46.21-197.27-61.16-306.71-33.34c-170.83,43.44-256.98,149.65-157.15,218.26c149.29,102.66,148.88,244.02,37.82,381.07
c-261.05,322.06-363.57,512.7-142.28,713.95c241.24,219.53,812.72,166.75,1276.35-126.35
C2218.92,3773.38,2605.11,3533.86,2605.11,3533.86"/>
</g>
</g>
</g>
</g>
<g id="Eyes_1_">
<g>
<defs>
<rect id="SVGID_3_" x="95.01" y="544.01" width="3526.99" height="3526.99"/>
</defs>
<clipPath id="SVGID_4_">
<use xlink:href="#SVGID_3_" style="overflow:visible;"/>
</clipPath>
<g id="g14_2_" class="st3">
<g id="g24_1_" transform="translate(15.4063,25.5)">
<path id="path26_1_" class="st0" d="M1588.99,1547.21c0,135.3-87.78,244.93-195.94,244.93
c-108.16,0-195.94-109.63-195.94-244.93c0-135.2,87.78-244.93,195.94-244.93C1501.21,1302.28,1588.99,1412.01,1588.99,1547.21"
/>
</g>
<g id="g32_1_" transform="translate(9.6709,29.667)">
<path id="path34_1_" class="st0" d="M1032.82,1134.8c-16.07-8.52-29.69-21.85-38.31-38.99c-21.16-42.03-3.92-90.82,38.5-109.04
c417.95-179.29,754.29-4.21,768.39,3.33c42.42,22.63,59.57,73.28,38.31,113.06c-21.16,39.68-72.5,53.49-114.92,31.16
c-12.05-6.27-277.46-140.3-615.07,4.6C1084.54,1149.59,1056.13,1147.24,1032.82,1134.8"/>
</g>
<g id="g36_1_" transform="translate(14.7427,16.4277)">
<path id="path38_1_" class="st0" d="M1524.64,2445.12c-13.32-12.44-23.12-28.71-27.04-47.61c-9.7-45.95,19.4-88.76,65.15-95.42
c449.89-66.43,730.09,188.99,741.94,199.86c35.27,32.72,38.7,85.92,8.03,119.04c-30.57,32.92-83.77,33.11-118.94,0.59
c-10.19-9.01-232.39-206.52-595.87-152.93C1570.78,2472.65,1543.94,2463.15,1524.64,2445.12"/>
</g>
<g id="g40_1_" transform="translate(20.4307,25.917)">
<path id="path42_1_" class="st0" d="M2076.21,1505.94c-15.28-9.6-28.02-23.81-35.47-41.54c-18.32-43.3,2.25-90.92,45.75-106.2
c429.22-150.48,752.91,47.03,766.53,55.55c40.66,25.47,54.28,77.1,30.47,115.41c-23.71,38.21-76.03,48.5-116.68,23.32
c-11.76-7.15-267.27-158.81-613.99-37.23C2126.96,1524.26,2098.75,1519.95,2076.21,1505.94"/>
</g>
<g id="g28_1_" transform="translate(26,24.5)">
<path id="path30_1_" class="st0" d="M2616.28,1646.19c0,135.3-87.69,244.93-195.94,244.93
c-108.16,0-195.94-109.63-195.94-244.93c0-135.2,87.78-244.93,195.94-244.93C2528.6,1401.26,2616.28,1510.99,2616.28,1646.19"
/>
</g>
</g>
</g>
</g>
</g>
<g id="Path">
<path id="CutLine" class="st4" d="M528,128C532-14,669,0,669,0h346l2629,1464c0,0,78,34,28,108s-217,359-217,359s-22,9,9,226
s-204,313-204,313l-545,356c0,0,421.37,492.67,29.68,732.33S1798,4056,1798,4056s28.13,15-290.94,15s-828.56,0-828.56,0
S531,4102,528,3904S528,128,528,128z"/>
</g>
<g id="Draw">
<polyline id="BG" class="st5" points="1128.5,650.67 3378,1950 3378,2137 1128.5,3432.67 "/>
<rect id="Left" x="678.5" y="128.48" class="st6" width="450" height="3821.5"/>
<rect id="Top" x="1915.71" y="-583.55" transform="matrix(0.5 -0.866 0.866 0.5 225.753 2341.5386)" class="st7" width="450" height="3117.62"/>
<g id="Finger">
<g id="g44" transform="translate(17.2764,0.8682)">
<path id="path46" class="st8" d="M2605.11,3533.86c0,0,159.85-112.71,149-195.05c-10.68-85.2-127.58-48.89-127.58-48.89
s136.18-82.82,112.7-180.35c-22.17-91.83-167.38-48.54-167.38-48.54s119.56-92.9,85.39-182.75
c-28.87-75.6-188.03-44.94-188.03-44.94s651.47-417.09,718.51-459.5c66.86-42.42,160.29-131.95,87.28-198.12
c-72.76-66.37-205.83-7.85-269.88,32.69c-64.01,40.62-874.42,553.28-1153.93,730.24c-29.84,18.84-169.66,107.16-186.59,118.03
c-69.96,44.42-112.22,42.02-74.07-13.01c51.14-73.63,74.73-139.7,55.45-222.1c-20.44-86.69-114.31-161.6-159.65-186.44
c-84.35-46.21-197.27-61.16-306.71-33.34c-170.83,43.44-256.98,149.65-157.15,218.26c149.29,102.66,148.88,244.02,37.82,381.07
c-261.05,322.06-363.57,512.7-142.28,713.95c241.24,219.53,812.72,166.75,1276.35-126.35
C2218.92,3773.38,2605.11,3533.86,2605.11,3533.86"/>
</g>
</g>
<g id="Eyes">
<g id="g24" transform="translate(15.4063,25.5)">
<path id="path26" class="st9" d="M1588.99,1547.21c0,135.3-87.78,244.93-195.94,244.93c-108.16,0-195.94-109.63-195.94-244.93
c0-135.2,87.78-244.93,195.94-244.93C1501.21,1302.28,1588.99,1412.01,1588.99,1547.21"/>
</g>
<g id="g32" transform="translate(9.6709,29.667)">
<path id="path34" class="st9" d="M1032.82,1134.8c-16.07-8.52-29.69-21.85-38.31-38.99c-21.16-42.03-3.92-90.82,38.5-109.04
c417.95-179.29,754.29-4.21,768.39,3.33c42.42,22.63,59.57,73.28,38.31,113.06c-21.16,39.68-72.5,53.49-114.92,31.16
c-12.05-6.27-277.46-140.3-615.07,4.6C1084.54,1149.59,1056.13,1147.24,1032.82,1134.8"/>
</g>
<g id="g36" transform="translate(14.7427,16.4277)">
<path id="path38" class="st9" d="M1524.64,2445.12c-13.32-12.44-23.12-28.71-27.04-47.61c-9.7-45.95,19.4-88.76,65.15-95.42
c449.89-66.43,730.09,188.99,741.94,199.86c35.27,32.72,38.7,85.92,8.03,119.04c-30.57,32.92-83.77,33.11-118.94,0.59
c-10.19-9.01-232.39-206.52-595.87-152.93C1570.78,2472.65,1543.94,2463.15,1524.64,2445.12"/>
</g>
<g id="g40" transform="translate(20.4307,25.917)">
<path id="path42" class="st9" d="M2076.21,1505.94c-15.28-9.6-28.02-23.81-35.47-41.54c-18.32-43.3,2.25-90.92,45.75-106.2
c429.22-150.48,752.91,47.03,766.53,55.55c40.66,25.47,54.28,77.1,30.47,115.41c-23.71,38.21-76.03,48.5-116.68,23.32
c-11.76-7.15-267.27-158.81-613.99-37.23C2126.96,1524.26,2098.75,1519.95,2076.21,1505.94"/>
</g>
<g id="g28" transform="translate(26,24.5)">
<path id="path30" class="st10" d="M2616.28,1646.19c0,135.3-87.69,244.93-195.94,244.93c-108.16,0-195.94-109.63-195.94-244.93
c0-135.2,87.78-244.93,195.94-244.93C2528.6,1401.26,2616.28,1510.99,2616.28,1646.19"/>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

View File

@@ -1,3 +1,5 @@
selectedColumn = 0
selectedToot = 0
$(function ($) {
//キーボードショートカット
$(window).keydown(function (e) {
@@ -12,6 +14,17 @@ $(function ($) {
} else {
var wv = true;
}
//Enter
if (e.keyCode === 13) {
if($("#src").is(':focus')){
src()
return false;
}
if($("#list-add").is(':focus')){
makeNewList()
return false;
}
}
//Ctrl+Shift+Enter:Lgen
if (event.metaKey || event.ctrlKey && wv) {
if (event.shiftKey) {
@@ -118,7 +131,7 @@ $(function ($) {
}
}
//Ctrl+Sift+P:プロフ
if ((event.ctrlKey) && event.shiftKey) {
if ((event.metaKey || event.ctrlKey) && event.shiftKey) {
if (e.keyCode === 80) {
profShow()
return false;
@@ -132,30 +145,82 @@ $(function ($) {
return false;
}
}
//矢印:選択
if (e.code == "ArrowLeft") {
//left
if ($("#imagemodal").hasClass("open")) {
imgCont('prev');
return false;
}
if (selectedColumn > 0) {
selectedColumn--
}
tootSelector(selectedColumn, selectedToot)
return false;
} else if (e.code == "ArrowUp") {
//up
if ($("#imagemodal").hasClass("open")) {
return false;
}
if (selectedToot > 0) {
selectedToot--
}
tootSelector(selectedColumn, selectedToot)
return false;
} else if (e.code == "ArrowRight") {
//right
if ($("#imagemodal").hasClass("open")) {
imgCont('next');
return false;
}
if (selectedColumn < $(".tl-box").length - 1) {
selectedColumn++
}
tootSelector(selectedColumn, selectedToot)
return false;
} else if (e.code == "ArrowDown") {
//down
if ($("#imagemodal").hasClass("open")) {
return false;
}
selectedToot++
tootSelector(selectedColumn, selectedToot)
return false;
}
//Ctrl+U:0,0選択
if (event.ctrlKey || event.metaKey) {
if (e.keyCode === 85) {
selectedToot = 0
selectedColumn = 0
tootSelector(0, 0)
return false;
}
}
//選択時
if (e.keyCode == 70) {
var id = $(".selectedToot").attr('unique-id')
var acct_id = $('#timeline_' + selectedColumn).attr("data-acct")
fav(id, acct_id, false)
return false;
}
if (e.keyCode == 66) {
var id = $(".selectedToot").attr('unique-id')
var acct_id = $('#timeline_' + selectedColumn).attr("data-acct")
rt(id, acct_id, false)
return false;
}
if (e.keyCode == 82) {
var id = $(".selectedToot").attr('unique-id')
var acct_id = $('#timeline_' + selectedColumn).attr("data-acct")
var ats_cm = $('.selectedToot .rep-btn').attr("data-men")
var mode = $('.selectedToot .rep-btn').attr("data-visen")
re(id, ats_cm, acct_id, mode)
return false;
}
}
//textareaフォーカス時
if (hasFocus2 && wv) {
if (event.metaKey || event.ctrlKey) {
//Ctrl+B:太字
if (e.keyCode === 66) {
tagsel('b');
return false;
}
//Ctrl+I:斜字
if (e.keyCode === 73) {
tagsel('i');
return false;
}
//Ctrl+U:下線
if (e.keyCode === 85) {
tagsel('u');
return false;
}
//Ctrl+S:取り消し線
if (e.keyCode === 83) {
tagsel('s');
return false;
}
//C+S+(No):ワンクリ
if ((event.metaKey || event.ctrlKey) && event.shiftKey) {
if (e.keyCode >= 49 && e.keyCode <= 51) {
@@ -166,22 +231,28 @@ $(function ($) {
}
}
}
//イメージビューワー切り替え
if (e.keyCode === 37 && wv) {
if ($("#imagemodal").hasClass("open")) {
imgCont('prev');
return false;
}
}
if (e.keyCode === 39 && wv) {
if ($("#imagemodal").hasClass("open")) {
imgCont('next');
return false;
}
}
});
//クリアボタン
$("#clear").click(function () {
clear();
});
});
});
//選択する
function tootSelector(column, toot) {
$('.cvo').removeClass("selectedToot")
$('#timeline_' + column + ' .cvo').eq(toot).addClass("selectedToot")
var scr = $('.tl-box[tlid=' + column + ']').scrollTop()
var elem = $('.selectedToot').offset().top
var top = elem - $('.tl-box').height() + scr
if (top > 0) {
top = top + $('.selectedToot').height()
if (top > scr) {
$('.tl-box[tlid=' + column + ']').animate({ scrollTop: top })
}
} else if (elem < 0) {
var to = scr + elem - $('.selectedToot').height()
if (to < scr) {
$('.tl-box[tlid=' + column + ']').animate({ scrollTop: to })
}
}
}

View File

@@ -23,4 +23,7 @@ $(document).ready(function () {
}
);
$('.collapsible').collapsible();
$('#videomodal').modal({
onCloseEnd: stopVideo
});
});

View File

@@ -37,7 +37,6 @@
}
};
var $t = $.timeago;
$.extend($.timeago, {
settings: {
refreshMillis: 60000,
@@ -47,22 +46,22 @@
cutoff: 0,
autoDispose: true,
strings: {
prefixAgo: null,
prefixFromNow: "今から",
suffixAgo: "",
suffixFromNow: "",
inPast: '',
seconds: "%d秒前",
minute: "1分前",
minutes: "%d分前",
hour: "1時間前",
hours: "%d時間前",
day: "昨日",
days: "%d日前",
month: "昨月",
months: "%dヶ月前",
year: "去年",
years: "%d年前",
prefixAgo: lang.lang_time_prefixAgo,
prefixFromNow: lang.lang_time_prefixFromNow,
suffixAgo: lang.lang_time_suffixAgo,
suffixFromNow: lang.lang_time_suffixFromNow,
inPast: lang.lang_time_inPast,
seconds: lang.lang_time_seconds,
minute: lang.lang_time_minute,
minutes: lang.lang_time_minutes,
hour: lang.lang_time_hour,
hours: lang.lang_time_hours,
day: lang.lang_time_day,
days: lang.lang_time_days,
month: lang.lang_time_month,
months: lang.lang_time_months,
year: lang.lang_time_year,
years: lang.lang_time_years,
wordSeparator: " ",
numbers: []
}

View File

@@ -1,270 +1,337 @@
//バージョンチェッカー
function verck(ver) {
console.log("%c Welcome😊", "color: red;font-size:200%;")
var date = new Date();
function verck(ver, jp) {
console.log('%c Welcome😊', 'color: red;font-size:200%;')
var date = new Date()
var show = false
if (localStorage.getItem("ver") != ver && localStorage.getItem("winstore")) {
if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) {
//ちょっと削除とリンク解析の都合上アレ(s)
//対象外のアプデ:storageが20の最初まで"Usamin (18.6.5)"
if (!localStorage.getItem("usamin_18_6_5_flag")) {
localStorage.setItem("usamin_18_6_5_flag", true)
var multi = localStorage.getItem("column");
var obj = JSON.parse(multi);
if (!localStorage.getItem('usamin_18_6_5_flag')) {
localStorage.setItem('usamin_18_6_5_flag', true)
var multi = localStorage.getItem('column')
var obj = JSON.parse(multi)
for (var i = 0; i < obj.length; i++) {
localStorage.removeItem("card_" + i);
localStorage.removeItem('card_' + i)
}
}
//ちょっと削除とリンク解析の都合上アレ(e)
localStorage.setItem("ver", ver);
show = true
console.log("%c Thank you for your update🎉", "color: red;font-size:200%;");
$(document).ready(function () {
$('#releasenote').modal('open');
verp = ver.replace('(', '');
verp = verp.replace('.', '-');
verp = verp.replace('.', '-');
verp = verp.replace('[', '-');
verp = verp.replace(']', '');
verp = verp.replace(')', '');
verp = verp.replace(' ', '_');
console.log("%c " + verp, "color: red;font-size:200%;");
if (lang.language == "ja") {
$("#release-" + verp).show();
} else {
$("#release-en").show();
console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
$(document).ready(function() {
if (localStorage.getItem('winstore')) {
$('#releasenote').modal('open')
}
});
verp = ver.replace('(', '')
verp = verp.replace('.', '-')
verp = verp.replace('.', '-')
verp = verp.replace('[', '-')
verp = verp.replace(']', '')
verp = verp.replace(')', '')
verp = verp.replace(' ', '_')
console.log('%c ' + verp, 'color: red;font-size:200%;')
if (lang.language == 'ja') {
$('#release-' + verp).show()
} else {
$('#release-en').show()
}
})
}
localStorage.setItem('ver', ver)
if (!show) {
console.log(show)
if (date.getMonth() + 1 >= localStorage.getItem("showSupportMe") || !localStorage.getItem("showSupportMe")) {
if (
date.getFullYear() * 100 + date.getMonth() + 1 >= localStorage.getItem('showSupportMe') ||
!localStorage.getItem('showSupportMe')
) {
if (date.getMonth() == 11) {
var nextmonth = 1
var yrs = date.getFullYear() + 1
var nextmonth = yrs * 100 + 1
} else {
var nextmonth = date.getMonth() + 2
var yrs = date.getFullYear()
var nextmonth = yrs * 100 + date.getMonth() + 2
}
if (lang.language != "ja") {
$("#support-btm-ja").addClass("hide");
$("#support-btm-en").removeClass("hide");
if (lang.language != 'ja') {
$('#support-btm-ja').addClass('hide')
$('#support-btm-en').removeClass('hide')
}
localStorage.setItem("showSupportMe", nextmonth)
$("#support-btm").removeClass("hide")
$("#support-btm").animate({
'bottom': '0'
}, {
'duration': 300
});
localStorage.setItem('showSupportMe', nextmonth)
$('#support-btm').removeClass('hide')
$('#support-btm').animate(
{
bottom: '0'
},
{
duration: 300
}
)
}
}
var platform = localStorage.getItem("platform");
console.log("Your platform:" + platform)
if (!localStorage.getItem("winstore")) {
storeDialog(platform, ver)
var platform = localStorage.getItem('platform')
console.log('Your platform:' + platform)
if (!localStorage.getItem('winstore')) {
$('#start').css('display', 'flex')
}
if (localStorage.getItem("winstore") == "brewcask" || localStorage.getItem("winstore") == "snapcraft" || localStorage.getItem("winstore") == "winstore") {
var winstore = true;
if (
localStorage.getItem('winstore') == 'brewcask' ||
localStorage.getItem('winstore') == 'snapcraft' ||
localStorage.getItem('winstore') == 'winstore'
) {
var winstore = true
} else {
var winstore = false;
var winstore = false
}
var l = 5;
var l = 5
// 生成する文字列に含める文字セット
var c = "abcdefghijklmnopqrstuvwxyz0123456789";
var cl = c.length;
var r = "";
var c = 'abcdefghijklmnopqrstuvwxyz0123456789'
var cl = c.length
var r = ''
for (var i = 0; i < l; i++) {
r += c[Math.floor(Math.random() * cl)];
r += c[Math.floor(Math.random() * cl)]
}
var start = "https://thedesk.top/ver.json";
var start = 'https://thedesk.top/ver.json'
fetch(start, {
method: 'GET'
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (mess) {
console.table(mess);
if (mess) {
var platform = localStorage.getItem("platform");
if (platform == "darwin") {
var newest = mess.desk_mac;
} else {
var newest = mess.desk;
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
if (newest == ver) {
todo(lang.lang_version_usever.replace("{{ver}}", mess.desk));
//betaかWinstoreならアプデチェックしない
} else if (ver.indexOf("beta") != -1 || winstore) {
} else {
localStorage.removeItem("instance")
if (localStorage.getItem("new-ver-skip")) {
if (localStorage.getItem("next-ver") != newest) {
postMessage(["sendSinmpleIpc", "update"], "*")
} else {
console.warn(lang.lang_version_skipver);
todo(lang.lang_version_skipver);
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(mess) {
console.table(mess)
if (mess) {
//askjp_jp_ua: 2019年10月24日、mstdn.jpによるユーザーエージェントアクセス制限
if (jp && mess.jp_ua && !localStorage.getItem('askjp_jp_ua')) {
localStorage.setItem('askjp_jp_ua', true)
$('#askjp_jp_ua').removeClass('hide')
}
var platform = localStorage.getItem('platform')
if (platform == 'darwin') {
var newest = mess.desk_mac
} else {
postMessage(["sendSinmpleIpc", "update"], "*")
var newest = mess.desk
}
if (newest == ver) {
todo(lang.lang_version_usever.replace('{{ver}}', mess.desk))
//betaかWinstoreならアプデチェックしない
} else if (ver.indexOf('beta') != -1 || winstore) {
} else {
localStorage.removeItem('instance')
if (localStorage.getItem('new-ver-skip')) {
if (localStorage.getItem('next-ver') != newest) {
postMessage(['sendSinmpleIpc', 'update'], '*')
} else {
console.warn(lang.lang_version_skipver)
todo(lang.lang_version_skipver)
}
} else {
postMessage(['sendSinmpleIpc', 'update'], '*')
}
}
}
}
});
if (!localStorage.getItem("last-notice-id")) {
localStorage.setItem("last-notice-id", 0)
})
if (!localStorage.getItem('last-notice-id')) {
localStorage.setItem('last-notice-id', 0)
}
var start = "https://thedesk.top/notice?since_id=" + localStorage.getItem("last-notice-id");
var start = 'https://thedesk.top/notice?since_id=' + localStorage.getItem('last-notice-id')
fetch(start, {
method: 'GET'
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (mess) {
if (mess.length < 1) {
return false;
} else {
var last = localStorage.getItem("last-notice-id")
localStorage.setItem("last-notice-id", mess[0].ID)
for (i = 0; i < mess.length; i++) {
var obj = mess[i];
if (obj.ID * 1 <= last) {
break;
} else {
var show = true;
if (obj.toot != "") {
var toot = '<button class="btn-flat toast-action" onclick="detEx(\'' + obj.toot + '\',\'main\')">Show</button>';
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(mess) {
if (mess.length < 1) {
return false
} else {
var last = localStorage.getItem('last-notice-id')
localStorage.setItem('last-notice-id', mess[0].ID)
for (i = 0; i < mess.length; i++) {
var obj = mess[i]
if (obj.ID * 1 <= last) {
break
} else {
var toot = "";
}
if (obj.ver != "") {
if (obj.ver == ver) {
show = true;
} else {
show = false;
if (obj.type == 'textv2') {
if (~obj.languages.indexOf(lang.language)) {
var show = true
if (obj.toot != '') {
var toot =
'<button class="btn-flat toast-action" onclick="detEx(\'' +
obj.toot +
"','main')\">Show</button>"
} else {
var toot = ''
}
if (obj.ver != '') {
if (obj.ver == ver) {
show = true
} else {
show = false
}
}
if (obj.domain != '') {
var multi = localStorage.getItem('multi')
if (multi) {
show = false
var accts = JSON.parse(multi)
Object.keys(accts).forEach(function(key) {
var acct = accts[key]
if (acct.domain == obj.domain) {
show = true
}
})
}
}
if (show) {
M.toast({
html:
escapeHTML(obj.text) +
toot +
'<span class="sml grey-text">(スライドして消去)</span>',
displayLength: 86400
})
}
}
}
}
if (obj.domain != "") {
var multi = localStorage.getItem("multi");
}
}
})
}
var infostreaming = false
function infowebsocket() {
infows = new WebSocket('wss://thedesk.top/ws/')
infows.onopen = function(mess) {
console.log([tlid, ':Connect Streaming Info:', mess])
infostreaming = true
}
infows.onmessage = function(mess) {
console.log([tlid, ':Receive Streaming:', JSON.parse(mess.data)])
var obj = JSON.parse(mess.data)
if (obj.type != 'counter') {
if (obj.type == 'textv2') {
if (~obj.languages.indexOf(lang.language)) {
localStorage.setItem('last-notice-id', obj.id)
var show = true
if (obj.toot != '') {
var toot =
'<button class="btn-flat toast-action" onclick="detEx(\'' +
obj.toot +
"','main')\">Show</button>"
} else {
var toot = ''
}
if (obj.ver != '') {
if (obj.ver == ver) {
show = true
} else {
show = false
}
}
if (obj.domain != '') {
var multi = localStorage.getItem('multi')
if (multi) {
show = false;
var accts = JSON.parse(multi);
Object.keys(accts).forEach(function (key) {
var acct = accts[key];
show = false
var accts = JSON.parse(multi)
Object.keys(accts).forEach(function(key) {
var acct = accts[key]
if (acct.domain == obj.domain) {
show = true;
show = true
}
});
})
}
}
if (show) {
M.toast({ html: escapeHTML(obj.text) + toot + '<span class="sml grey-text">(スライドして消去)</span>', displayLength: 86400 })
console.log(obj.text)
console.log(escapeHTML(obj.text))
M.toast({
html:
escapeHTML(obj.text) +
toot +
'<span class="sml grey-text">(スライドして消去)</span>',
displayLength: 86400
})
}
}
}
}
});
}
var infostreaming = false;
function infowebsocket() {
infows = new WebSocket("wss://thedesk.top/ws/");
infows.onopen = function (mess) {
console.log([tlid, ":Connect Streaming Info:", mess]);
infostreaming = true;
}
infows.onmessage = function (mess) {
console.log([tlid, ":Receive Streaming:", JSON.parse(mess.data)]);
var obj = JSON.parse(mess.data);
if (obj.type != "counter") {
localStorage.setItem("last-notice-id", obj.id)
var show = true;
if (obj.toot != "") {
var toot = '<button class="btn-flat toast-action" onclick="detEx(\'' + obj.toot + '\',\'main\')">Show</button>';
} else {
var toot = "";
}
if (obj.ver != "") {
if (obj.ver == ver) {
show = true;
} else {
show = false;
}
}
if (obj.domain != "") {
var multi = localStorage.getItem("multi");
if (multi) {
show = false;
var accts = JSON.parse(multi);
Object.keys(accts).forEach(function (key) {
var acct = accts[key];
if (acct.domain == obj.domain) {
show = true;
}
});
}
}
if (show) {
M.toast({ html: escapeHTML(obj.Text) + toot + '<span class="sml grey-text">(スライドして消去)</span>', displayLength: 86400 })
}
} else {
$("#persons").text(obj.text);
$('#persons').text(obj.text)
}
}
infows.onerror = function (error) {
infostreaming = false;
console.error("Error closing:info");
console.error(error);
return false;
};
infows.onclose = function () {
infostreaming = false;
console.error("Closing:info");
};
}
setInterval(function () {
if (!infostreaming) {
console.log("try to connect to base-streaming")
infowebsocket();
infows.onerror = function(error) {
infostreaming = false
console.error('Error closing:info')
console.error(error)
return false
}
}, 10000);
infows.onclose = function() {
infostreaming = false
console.error('Closing:info')
}
}
setInterval(function() {
if (!infostreaming) {
console.log('try to connect to base-streaming')
infowebsocket()
}
}, 10000)
function openRN() {
$('#releasenote').modal('open');
if (lang.language == "ja") {
verp = ver.replace('(', '');
verp = verp.replace('.', '-');
verp = verp.replace('.', '-');
verp = verp.replace('[', '-');
verp = verp.replace(']', '');
verp = verp.replace(')', '');
verp = verp.replace(' ', '_');
$("#release-" + verp).show();
$('#releasenote').modal('open')
if (lang.language == 'ja') {
verp = ver.replace('(', '')
verp = verp.replace('.', '-')
verp = verp.replace('.', '-')
verp = verp.replace('[', '-')
verp = verp.replace(']', '')
verp = verp.replace(')', '')
verp = verp.replace(' ', '_')
$('#release-' + verp).show()
} else {
$("#release-en").show();
$('#release-en').show()
}
}
function closeSupport() {
$("#support-btm").animate({
'bottom': '-300px'
}, {
'duration': 300,
'complete': function () {
$("#support-btm").addClass("hide")
$('#support-btm').animate(
{
bottom: '-300px'
},
{
duration: 300,
complete: function() {
$('#support-btm').addClass('hide')
}
});
}
)
}
function storeDialog(platform, ver) {
if (platform == "win32") {
var mes = lang.lang_version_platform;
} else if (platform == "linux") {
var mes = lang.lang_version_platform_linux;
} else if (platform == "darwin") {
var mes = lang.lang_version_platform_mac;
if (platform == 'win32') {
var mes = lang.lang_version_platform
} else if (platform == 'linux') {
var mes = lang.lang_version_platform_linux
} else if (platform == 'darwin') {
var mes = lang.lang_version_platform_mac
}
Swal.fire({
title: "Select your platform",
title: 'Select your platform',
text: mes,
type: 'info',
showCancelButton: true,
@@ -272,31 +339,37 @@ function storeDialog(platform, ver) {
cancelButtonColor: '#3085d6',
confirmButtonText: lang.lang_no,
cancelButtonText: lang.lang_yesno
}).then((result) => {
}).then(result => {
//逆にしてる
if (!result.value) {
localStorage.setItem("winstore", "winstore")
localStorage.setItem('winstore', 'winstore')
} else {
localStorage.setItem("winstore", "localinstall")
localStorage.setItem('winstore', 'localinstall')
}
localStorage.setItem("ver", ver);
localStorage.setItem('ver', ver)
show = true
console.log("%c Thank you for your update🎉", "color: red;font-size:200%;");
$(document).ready(function () {
$('#releasenote').modal('open');
verp = ver.replace('(', '');
verp = verp.replace('.', '-');
verp = verp.replace('.', '-');
verp = verp.replace('[', '-');
verp = verp.replace(']', '');
verp = verp.replace(')', '');
verp = verp.replace(' ', '_');
console.log("%c " + verp, "color: red;font-size:200%;");
if (lang.language == "ja") {
$("#release-" + verp).show();
console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
$(document).ready(function() {
$('#releasenote').modal('open')
verp = ver.replace('(', '')
verp = verp.replace('.', '-')
verp = verp.replace('.', '-')
verp = verp.replace('[', '-')
verp = verp.replace(']', '')
verp = verp.replace(')', '')
verp = verp.replace(' ', '_')
console.log('%c ' + verp, 'color: red;font-size:200%;')
if (lang.language == 'ja') {
$('#release-' + verp).show()
} else {
$("#release-en").show();
$('#release-en').show()
}
});
})
})
}
}
function closeStart() {
$('#start').css('display', 'none')
var platform = localStorage.getItem('platform')
var ver = localStorage.getItem('ver')
storeDialog(platform, ver)
}

View File

@@ -50,6 +50,10 @@ function customEmoji() {
emojiList('home')
}
function defEmoji(target) {
var selin = $("#textarea").prop('selectionStart');
if (!selin) {
selin = 0;
}
var emojiraw = newpack.filter(function (item, index) {
if (item.short_name == target) return true;
});
@@ -60,22 +64,11 @@ function defEmoji(target) {
emoji = twemoji.convert.fromCodePoint(hex[0]);
}
var now = $("#textarea").val();
var selin = localStorage.getItem("cursor");
var now = $("#textarea").val();
if (selin > 0) {
var before = now.substr(0, selin);
var after = now.substr(selin, now.length);
newt = before + emoji + after;
} else {
newt = emoji + now;
}
var before = now.substr(0, selin);
var after = now.substr(selin, now.length);
newt = before + emoji + after;
$("#textarea").val(newt);
$("#textarea").focus();
var selin = $("#textarea").prop('selectionStart');
if (!selin) {
selin = 0;
}
localStorage.setItem("cursor", selin);
}
function faicon() {
var json = faicons;

View File

@@ -9,22 +9,11 @@ var idata = {
"kirishima.cloud_public": "パブリックタイムライン",
"minohdon.jp": "instance",
"minohdon.jp_name": "箕面どん",
"minohdon.jp_letters": "500",
"minohdon.jp_bbcode": "disabled",
"minohdon.jp_markdown": "disabled",
"minohdon.jp_glitch": "disabled",
"knzk.me": "instance",
"knzk.me_name": "Knzk",
"knzk.me_letters": "5000",
"knzk.me_bbcode": "disabled",
"knzk.me_markdown": "disabled",
"knzk.me_glitch": "disabled",
"fedibird.com":"instance",
"fedibird.com_name":"Fedibird",
"fedibird.com_quote":"enabled",
"mastodos.com": "instance",
"mastodos.com_name": "マストどす",
"mastodos.com_letters": "500",
"mastodos.com_bbcode": "disabled",
"mastodos.com_markdown": "disabled",
"mastodos.com_glitch": "disabled",
"dev.kirishima.cloud": "hidden",
"dev.kirishima.cloud_name": "アスタルテ(Dev)",
"dev.kirishima.cloud_letters": "6229",
@@ -33,15 +22,8 @@ var idata = {
"dev.kirishima.cloud_glitch": "enabled",
"mstdn.y-zu.org": "instance",
"mstdn.y-zu.org_name": "Yづドン(Y-zuDon)",
"mstdn.y-zu.org_letters": "500",
"mstdn.y-zu.org_bbcode": "disabled",
"mstdn.y-zu.org_markdown": "enabled",
"mstdn.y-zu.org_glitch": "disabled",
"imastodon.net": "instance",
"imastodon.net_name": "im@stodon",
"imastodon.net_letters": "500",
"imastodon.net_bbcode": "disabled",
"imastodon.net_markdown": "disabled",
"imastodon.net_home": "オフィス",
"imastodon.net_local": "楽屋",
"imastodon.net_notification": "ホワイトボード",
@@ -50,12 +32,6 @@ var idata = {
"imastodon.net_fav": "の頭にティンときたようです",
"imastodon.net_bt": ":「わかるわ」",
"imastodon.net_follow": "名刺をいただきました",
"imastodon.net_glitch": "disabled",
"mstdn.osaka": "instance",
"mstdn.osaka_name": "大阪丼",
"mstdn.osaka_letters": "500",
"mstdn.osaka_bbcode": "disabled",
"mstdn.osaka_markdown": "disabled",
"mstdn.osaka_home": "ウチ",
"mstdn.osaka_local": "近所",
"mstdn.osaka_notification": "あめちゃん",
@@ -64,12 +40,9 @@ var idata = {
"mstdn.osaka_fav": "がええやん言いました",
"mstdn.osaka_bt": "がしばいた",
"mstdn.osaka_follow": "ツルまれました",
"mstdn.osaka_glitch": "disabled",
"mstdn.kemono-friends.info": "instance",
"mstdn.kemono-friends.info_name": "ますとどんちほー",
"mstdn.kemono-friends.info_letters": "1024",
"mstdn.kemono-friends.info_bbcode": "disabled",
"mstdn.kemono-friends.info_markdown": "disabled",
"mstdn.kemono-friends.info_home": "なわばり",
"mstdn.kemono-friends.info_local": "ますとどんちほー",
"mstdn.kemono-friends.info_notification": "ねえねえ!",
@@ -77,19 +50,13 @@ var idata = {
"mstdn.kemono-friends.info_post": "がおー!",
"mstdn.kemono-friends.info_fav": ":「すごーい」",
"mstdn.kemono-friends.info_bt": ":「たーのしー」",
"mstdn.kemono-friends.info_glitch": "disabled",
"itabashi.0j0.jp": "instance",
"itabashi.0j0.jp_name": "板橋丼",
"itabashi.0j0.jp_letters": "1024",
"itabashi.0j0.jp_bbcode": "disabled",
"itabashi.0j0.jp_markdown": "disabled",
"itabashi.0j0.jp_glitch": "disabled",
"itabashi.0j0.jp_quote":"enabled",
"dtp-mstdn.jp": "instance",
"dtp-mstdn.jp_name": "DTP鯖",
"dtp-mstdn.jp_letters": "500",
"dtp-mstdn.jp_bbcode": "disabled",
"dtp-mstdn.jp_markdown": "disabled",
"dtp-mstdn.jp_glitch": "disabled",
"dtp-mstdn.jp_name": "dtp-mstdn.jp",
"dtp-mstdn.jp_quote":"enabled",
"misskey.io": "misskey",
"misskey.io_name": "misskey.io",
"misskey.io_letters": "1000",
@@ -99,7 +66,7 @@ var idata = {
"misskey.io_post": "Post",
"misskey.io_fav": " reacted your post.",
"misskey.io_bt": " reposted your post.",
"misskey.dev": "misskey.dev",
"misskey.dev": "misskey",
"misskey.dev_name": "misskey.dev",
"misskey.dev_letters": "1024",
"misskey.dev_bbcode": "disabled",
@@ -111,16 +78,11 @@ var idata = {
"precure.ml": "instance",
"precure.ml_name": "キュアスタ!",
"precure.ml_letters": "1024",
"precure.ml_bbcode": "disabled",
"precure.ml_markdown": "disabled",
"precure.ml_post": "キュア!",
"precure.ml_glitch": "disabled",
"best-friends.chat": "instance",
"best-friends.chat_name": "Best Friends",
"best-friends.chat_letters": "500",
"best-friends.chat_bbcode": "disabled",
"best-friends.chat_markdown": "disabled",
"best-friends.chat_glitch": "disabled",
"odakyu.app_quote":"enabled",
"nitiasa.com_quote":"enabled",
"biwakodon.com_quote":"enabled",
"comm.cx_quote":"enabled"
};
localStorage.setItem("instance", JSON.stringify(idata));

View File

@@ -2,88 +2,104 @@
//最初に読むやつ
//アスタルテ判定初期化
localStorage.removeItem("kirishima")
localStorage.removeItem("imas")
localStorage.removeItem("image");
localStorage.removeItem("stable")
localStorage.setItem("mode_misskey.xyz", "misskey")
localStorage.removeItem('kirishima')
localStorage.removeItem('quoters')
localStorage.removeItem('imas')
localStorage.removeItem('image')
localStorage.removeItem('stable')
localStorage.setItem('mode_misskey.xyz', 'misskey')
function ck() {
var main = localStorage.getItem("main");
var main = localStorage.getItem('main')
if (!main) {
localStorage.setItem("main", 0)
localStorage.setItem('main', 0)
}
var domainz = localStorage.getItem("domain_0");
var at = localStorage.getItem("acct_0_at");
//コード受信
if (location.search) {
var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
var mode = m[1];
var codex = m[2];
if (mode == "manager" || mode == "login") {
code(codex, mode);
var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
var mode = m[1]
var codex = m[2]
if (mode == 'manager' || mode == 'login') {
code(codex, mode)
} else {
}
}
var multi = localStorage.getItem("multi");
if (!multi || multi == "[]") {
var date = new Date();
localStorage.setItem("showSupportMe", date.getMonth() + 2)
location.href = "acct.html?mode=first&code=true"
var multi = localStorage.getItem('multi')
if (!multi || multi == '[]') {
var date = new Date()
localStorage.setItem('showSupportMe', date.getMonth() + 2)
location.href = 'acct.html?mode=first&code=true'
} else {
var obj = JSON.parse(multi);
Object.keys(obj).forEach(function (key) {
var acct = obj[key];
var obj = JSON.parse(multi)
var jp = false
Object.keys(obj).forEach(function(key) {
var acct = obj[key]
if (acct.domain) {
refresh(key, true)
}
});
if (acct.domain == 'mstdn.jp') {
jp = true
}
})
if (obj[0].domain) {
$("#tl").show();
ticker();
multiSelector();
verck(ver);
$("#something-wrong img").attr("src", "../../img/thinkingdesk.png")
$('#tl').show()
ticker()
multiSelector(false)
verck(ver, jp)
$('.stw').show()
$('#something-wrong img').attr('src', '../../img/thinking.svg')
}
}
}
ck();
ck()
//ログインポップアップ
function login(url) {
if ($('#linux:checked').val() == "on") {
var red = "urn:ietf:wg:oauth:2.0:oob"
if ($('#linux:checked').val() == 'on') {
var red = 'urn:ietf:wg:oauth:2.0:oob'
} else {
var red = 'thedesk://login';
var red = 'thedesk://login'
}
localStorage.setItem("redirect", red);
var start = "https://" + url + "/api/v1/apps";
var httpreq = new XMLHttpRequest();
httpreq.open('POST', start, true);
httpreq.setRequestHeader('Content-Type', 'application/json');
httpreq.responseType = "json";
httpreq.send(JSON.stringify({
scopes: 'read write follow',
client_name: "TheDesk(PC)",
redirect_uris: red,
website: "https://thedesk.top"
}));
httpreq.onreadystatechange = function () {
localStorage.setItem('redirect', red)
var start = 'https://' + url + '/api/v1/apps'
var httpreq = new XMLHttpRequest()
httpreq.open('POST', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
httpreq.responseType = 'json'
httpreq.send(
JSON.stringify({
scopes: 'read write follow',
client_name: 'TheDesk(PC)',
redirect_uris: red,
website: 'https://thedesk.top'
})
)
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
var json = httpreq.response;
var auth = "https://" + url + "/oauth/authorize?client_id=" + json[
"client_id"] + "&client_secret=" + json["client_secret"] +
"&response_type=code&redirect_uri=" + red + "&scope=read+write+follow";
localStorage.setItem("domain_" + acct_id, url);
localStorage.setItem("client_id", json["client_id"]);
localStorage.setItem("client_secret", json["client_secret"]);
$("#auth").show();
$("#masara").hide();
postMessage(["openUrl", auth], "*")
var json = httpreq.response
if (this.status !== 200) {
setLog(start, this.status, json)
}
var auth =
'https://' +
url +
'/oauth/authorize?client_id=' +
json['client_id'] +
'&client_secret=' +
json['client_secret'] +
'&response_type=code&redirect_uri=' +
red +
'&scope=read+write+follow'
localStorage.setItem('domain_' + acct_id, url)
localStorage.setItem('client_id', json['client_id'])
localStorage.setItem('client_secret', json['client_secret'])
$('#auth').show()
$('#masara').hide()
postMessage(['openUrl', auth], '*')
if ($('#linux:checked').val() == "on") {
if ($('#linux:checked').val() == 'on') {
} else {
postMessage(["sendSinmpleIpc", "quit"], "*")
postMessage(['sendSinmpleIpc', 'quit'], '*')
}
}
}
@@ -91,435 +107,507 @@ function login(url) {
//テキストボックスにURL入れた
function instance() {
var url = $("#url").val();
login(url);
var url = $('#url').val()
login(url)
}
//コードを入れた後認証
function code(code, mode) {
var red = localStorage.getItem("redirect");
localStorage.removeItem("redirect")
var red = localStorage.getItem('redirect')
localStorage.removeItem('redirect')
if (!code) {
var code = $("#code").val();
var code = $('#code').val()
}
if (localStorage.getItem("domain_tmp")) {
var url = localStorage.getItem("domain_tmp");
if (localStorage.getItem('domain_tmp')) {
var url = localStorage.getItem('domain_tmp')
} else {
var url = localStorage.getItem("domain_" + acct_id);
var url = localStorage.getItem('domain_' + acct_id)
}
var start = "https://" + url + "/oauth/token";
var id = localStorage.getItem("client_id");
var secret = localStorage.getItem("client_secret");
var start = 'https://' + url + '/oauth/token'
var id = localStorage.getItem('client_id')
var secret = localStorage.getItem('client_secret')
fetch(start, {
method: 'POST',
headers: {
'content-type': 'application/json'
},
body: JSON.stringify({
grant_type: "authorization_code",
grant_type: 'authorization_code',
redirect_uri: red,
client_id: id,
client_secret: secret,
code: code
})
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
todo(json);
if (json["access_token"]) {
localStorage.setItem(url + "_at", json["access_token"]);
if (mode == "manager") {
getdataAdv(url, json["access_token"]);
} else {
getdata();
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
}
});
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
todo(json)
if (json['access_token']) {
localStorage.setItem(url + '_at', json['access_token'])
if (mode == 'manager') {
getdataAdv(url, json['access_token'])
} else {
getdata()
}
}
})
}
//ユーザーデータ取得(最初)
function getdata() {
var acct_id = 0;
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/v1/accounts/verify_credentials";
var acct_id = 0
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/v1/accounts/verify_credentials'
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
if (json.error) {
console.error("Error:" + json.error);
M.toast({ html: lang.lang_fatalerroroccured + "Error:" + json.error, displayLength: 5000 })
return;
Authorization: 'Bearer ' + at
}
var avatar = json["avatar"];
//missingがmissingなやつ
if (avatar == "/avatars/original/missing.png") {
avatar = "./img/missing.svg";
}
var obj = [{
at: at,
name: json["display_name"],
domain: domain,
user: json["acct"],
prof: avatar,
id: json["id"],
vis: json["source"]["privacy"]
}];
var json = JSON.stringify(obj);
localStorage.setItem("multi", json);
localStorage.setItem("name_" + acct_id, json["display_name"]);
localStorage.setItem("user_" + acct_id, json["acct"]);
localStorage.setItem("user-id_" + acct_id, json["id"]);
localStorage.setItem("prof_" + acct_id, avatar);
$("#masara").hide();
$("#auth").hide();
$("#tl").show();
parseColumn()
ckdb();
});
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
if (json.error) {
console.error('Error:' + json.error)
M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
return
}
var avatar = json['avatar']
//missingがmissingなやつ
if (avatar == '/avatars/original/missing.png') {
avatar = './img/missing.svg'
}
var obj = [
{
at: at,
name: json['display_name'],
domain: domain,
user: json['acct'],
prof: avatar,
id: json['id'],
vis: json['source']['privacy']
}
]
var json = JSON.stringify(obj)
localStorage.setItem('multi', json)
localStorage.setItem('name_' + acct_id, json['display_name'])
localStorage.setItem('user_' + acct_id, json['acct'])
localStorage.setItem('user-id_' + acct_id, json['id'])
localStorage.setItem('prof_' + acct_id, avatar)
$('#masara').hide()
$('#auth').hide()
$('#tl').show()
parseColumn()
ckdb()
})
}
//ユーザーデータ取得(追加)
function getdataAdv(domain, at) {
var start = "https://" + domain + "/api/v1/accounts/verify_credentials";
var start = 'https://' + domain + '/api/v1/accounts/verify_credentials'
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
if (json.error) {
console.error("Error:" + json.error);
M.toast({ html: lang.lang_fatalerroroccured + "Error:" + json.error, displayLength: 5000 })
return;
Authorization: 'Bearer ' + at
}
var avatar = json["avatar"];
//missingがmissingなやつ
if (avatar == "/avatars/original/missing.png") {
avatar = "../../img/missing.svg";
}
if (json["source"]["privacy"]) {
var priv = json["source"]["privacy"];
} else {
var priv = "public";
}
var add = {
at: at,
name: json["display_name"],
domain: domain,
user: json["acct"],
prof: avatar,
id: json["id"],
vis: priv
};
var multi = localStorage.getItem("multi");
var obj = JSON.parse(multi);
var target = obj.lengtth;
obj.push(add);
localStorage.setItem("name_" + target, json["display_name"]);
localStorage.setItem("user_" + target, json["acct"]);
localStorage.setItem("user-id_" + target, json["id"]);
localStorage.setItem("prof_" + target, avatar);
var json = JSON.stringify(obj);
localStorage.setItem("multi", json);
location.href = "index.html";
});
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
if (json.error) {
console.error('Error:' + json.error)
M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
return
}
var avatar = json['avatar']
//missingがmissingなやつ
if (avatar == '/avatars/original/missing.png') {
avatar = '../../img/missing.svg'
}
if (json['source']['privacy']) {
var priv = json['source']['privacy']
} else {
var priv = 'public'
}
var add = {
at: at,
name: json['display_name'],
domain: domain,
user: json['acct'],
prof: avatar,
id: json['id'],
vis: priv
}
var multi = localStorage.getItem('multi')
var obj = JSON.parse(multi)
var target = obj.lengtth
obj.push(add)
localStorage.setItem('name_' + target, json['display_name'])
localStorage.setItem('user_' + target, json['acct'])
localStorage.setItem('user-id_' + target, json['id'])
localStorage.setItem('prof_' + target, avatar)
var json = JSON.stringify(obj)
localStorage.setItem('multi', json)
location.href = 'index.html'
})
}
//ユーザーデータ更新
function refresh(target, loadskip) {
var multi = localStorage.getItem("multi");
var obj = JSON.parse(multi);
if (obj[target].mode == "misskey") {
var multi = localStorage.getItem('multi')
var obj = JSON.parse(multi)
if (obj[target].mode == 'misskey') {
return
}
var start = "https://" + obj[target].domain +
"/api/v1/accounts/verify_credentials";
var start = 'https://' + obj[target].domain + '/api/v1/accounts/verify_credentials'
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + obj[target].at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
if (json.error) {
console.error("Error:" + json.error);
M.toast({ html: lang.lang_fatalerroroccured + "Error:" + json.error, displayLength: 5000 })
return;
Authorization: 'Bearer ' + obj[target].at
}
var avatar = json["avatar"];
//missingがmissingなやつ
if (avatar == "/avatars/original/missing.png" || !avatar) {
avatar = "./img/missing.svg";
}
var ref = {
at: obj[target].at,
name: json["display_name"],
domain: obj[target].domain,
user: json["acct"],
prof: avatar,
id: json["id"],
vis: json["source"]["privacy"]
};
localStorage.setItem("name_" + target, json["display_name"]);
localStorage.setItem("user_" + target, json["acct"]);
localStorage.setItem("user-id_" + target, json["id"]);
localStorage.setItem("prof_" + target, avatar);
localStorage.setItem("follow_" + target, json["following_count"]);
obj[target] = ref;
var json = JSON.stringify(obj);
localStorage.setItem("multi", json);
if (!loadskip) {
load();
}
});
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
if (json.error) {
console.error('Error:' + json.error)
M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
return
}
var avatar = json['avatar']
//missingがmissingなやつ
if (avatar == '/avatars/original/missing.png' || !avatar) {
avatar = './img/missing.svg'
}
var ref = {
at: obj[target].at,
name: json['display_name'],
domain: obj[target].domain,
user: json['acct'],
prof: avatar,
id: json['id'],
vis: json['source']['privacy']
}
if (obj[target].background) {
ref.background = obj[target].background
}
if (obj[target].text) {
ref.text = obj[target].text
}
localStorage.setItem('name_' + target, json['display_name'])
localStorage.setItem('user_' + target, json['acct'])
localStorage.setItem('user-id_' + target, json['id'])
localStorage.setItem('prof_' + target, avatar)
localStorage.setItem('follow_' + target, json['following_count'])
if (json['source']['sensitive']) {
localStorage.setItem('nsfw_' + target, 'true')
} else {
localStorage.removeItem('nsfw_' + target)
}
obj[target] = ref
var json = JSON.stringify(obj)
localStorage.setItem('multi', json)
if (!loadskip) {
load()
}
})
}
//MarkdownやBBCodeの対応、文字数制限をチェック
//絶対ストリーミングを閉じさせないマン
function ckdb(acct_id) {
var domain = localStorage.getItem("domain_" + acct_id);
localStorage.removeItem("home_" + acct_id);
localStorage.removeItem("bb_" + acct_id);
localStorage.removeItem("md_" + acct_id);
localStorage.removeItem("local_" + acct_id);
localStorage.removeItem("public_" + acct_id);
localStorage.removeItem("notification_" + acct_id);
localStorage.removeItem("post_" + acct_id);
localStorage.removeItem("fav_" + acct_id);
localStorage.removeItem("bt_" + acct_id);
localStorage.removeItem("followlocale_" + acct_id);
if (domain == "kirishima.cloud") {
localStorage.setItem("kirishima", "true");
$("#ranking-btn").show();
} else if (domain == "imastodon.net") {
localStorage.setItem("imas", "true");
$(".imasonly").show();
var domain = localStorage.getItem('domain_' + acct_id)
localStorage.removeItem('home_' + acct_id)
localStorage.removeItem('bb_' + acct_id)
localStorage.removeItem('md_' + acct_id)
localStorage.removeItem('local_' + acct_id)
localStorage.removeItem('public_' + acct_id)
localStorage.removeItem('notification_' + acct_id)
localStorage.removeItem('post_' + acct_id)
localStorage.removeItem('fav_' + acct_id)
localStorage.removeItem('bt_' + acct_id)
localStorage.removeItem('followlocale_' + acct_id)
if (domain == 'kirishima.cloud') {
localStorage.setItem('kirishima', 'true')
} else if (domain == 'imastodon.net') {
localStorage.setItem('imas', 'true')
$('.imasonly').show()
}
var at = localStorage.getItem("acct_" + acct_id + "_at");
var bbcode = domain + "_bbcode";
var letters = domain + "_letters";
if (localStorage.getItem("instance")) {
var json = JSON.parse(localStorage.getItem("instance"));
var at = localStorage.getItem('acct_' + acct_id + '_at')
var bbcode = domain + '_bbcode'
var letters = domain + '_letters'
var quoteMarker = domain + '_quote'
if (localStorage.getItem('instance')) {
var json = JSON.parse(localStorage.getItem('instance'))
if (json[quoteMarker] == 'enabled') {
localStorage.setItem('quoters', 'true')
localStorage.setItem('quote_' + acct_id, 'true')
}
if (json[bbcode]) {
if (json[bbcode] == "enabled") {
localStorage.setItem("bb_" + acct_id, "true");
if (json[bbcode] == 'enabled') {
localStorage.setItem('bb_' + acct_id, 'true')
} else {
localStorage.removeItem("bb_" + acct_id);
$("[data-activates='bbcode']").addClass("disabled");
$("[data-activates='bbcode']").prop("disabled", true);
localStorage.removeItem('bb_' + acct_id)
$("[data-activates='bbcode']").addClass('disabled')
$("[data-activates='bbcode']").prop('disabled', true)
}
} else {
localStorage.removeItem("bb_" + acct_id);
$("[data-activates='bbcode']").addClass("disabled");
$("[data-activates='bbcode']").addClass("disabled", true);
localStorage.removeItem('bb_' + acct_id)
$("[data-activates='bbcode']").addClass('disabled')
$("[data-activates='bbcode']").addClass('disabled', true)
}
if (json[domain + "_markdown"] == "enabled") {
localStorage.setItem("md_" + acct_id, "true");
$(".markdown").show();
if (json[domain + '_markdown'] == 'enabled') {
localStorage.setItem('md_' + acct_id, 'true')
$('.markdown').show()
} else {
$(".anti-markdown").hide();
$(".markdown").hide();
localStorage.removeItem("bb_" + acct_id);
$('.anti-markdown').hide()
$('.markdown').hide()
localStorage.removeItem('bb_' + acct_id)
}
if (json[domain + "_home"]) {
localStorage.setItem("home_" + acct_id, json[domain + "_home"]);
if (json[domain + '_home']) {
localStorage.setItem('home_' + acct_id, json[domain + '_home'])
}
if (json[domain + "_local"]) {
localStorage.setItem("local_" + acct_id, json[domain + "_local"]);
if (json[domain + '_local']) {
localStorage.setItem('local_' + acct_id, json[domain + '_local'])
}
if (json[domain + "_public"]) {
localStorage.setItem("public_" + acct_id, json[domain + "_public"]);
if (json[domain + '_public']) {
localStorage.setItem('public_' + acct_id, json[domain + '_public'])
}
if (json[domain + "_notification"]) {
localStorage.setItem("notification_" + acct_id, json[domain + "_notification"]);
if (json[domain + '_notification']) {
localStorage.setItem('notification_' + acct_id, json[domain + '_notification'])
}
if (json[domain + "_post"]) {
localStorage.setItem("post_" + acct_id, json[domain + "_post"]);
if (json[domain + '_post']) {
localStorage.setItem('post_' + acct_id, json[domain + '_post'])
}
if (json[domain + "_fav"]) {
localStorage.setItem("fav_" + acct_id, json[domain + "_fav"]);
if (json[domain + '_fav']) {
localStorage.setItem('fav_' + acct_id, json[domain + '_fav'])
}
if (json[domain + "_bt"]) {
localStorage.setItem("bt_" + acct_id, json[domain + "_bt"]);
if (json[domain + '_bt']) {
localStorage.setItem('bt_' + acct_id, json[domain + '_bt'])
}
if (json[domain + "_follow"]) {
localStorage.setItem("followlocale_" + acct_id, json[domain + "_follow"]);
if (json[domain + '_follow']) {
localStorage.setItem('followlocale_' + acct_id, json[domain + '_follow'])
}
}
if (localStorage.getItem("mode_" + domain) != "misskey") {
var start = "https://" + domain + "/api/v1/instance";
if (localStorage.getItem('mode_' + domain) != 'misskey') {
var start = 'https://' + domain + '/api/v1/instance'
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json'
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
console.error(error);
}).then(function (json) {
if (json.error) {
console.error(json.error);
return;
}
if (json) {
if (json["max_toot_chars"]) {
localStorage.setItem("letters_" + acct_id, json["max_toot_chars"]);
})
.then(function(response) {
return response.json()
})
.catch(function(error) {
console.error(error)
})
.then(function(json) {
if (json.error) {
console.error(json.error)
return
}
if (json["urls"]["streaming_api"]) {
localStorage.setItem("streaming_" + acct_id, json["urls"]["streaming_api"]);
if (json) {
if (json['max_toot_chars']) {
localStorage.setItem('letters_' + acct_id, json['max_toot_chars'])
}
if (json['urls']['streaming_api']) {
localStorage.setItem('streaming_' + acct_id, json['urls']['streaming_api'])
} else {
localStorage.removeItem('streaming_' + acct_id)
}
}
}
});
})
} else {
}
}
//アカウントを選択…を実装
function multiSelector() {
var multi = localStorage.getItem("multi");
function multiSelector(parseC) {
var multi = localStorage.getItem('multi')
if (!multi) {
var obj = [];
var json = JSON.stringify(obj);
localStorage.setItem("multi", json);
var obj = []
var json = JSON.stringify(obj)
localStorage.setItem('multi', json)
} else {
var obj = JSON.parse(multi);
var obj = JSON.parse(multi)
}
var templete;
if (localStorage.getItem("mainuse") == "main") {
var last = localStorage.getItem("main");
} else if (localStorage.getItem("last-use")) {
var last = localStorage.getItem("last-use");
if (last == "webview" || last == "noauth") {
last = "0";
var templete
if (localStorage.getItem('mainuse') == 'main') {
var last = localStorage.getItem('main')
} else if (localStorage.getItem('last-use')) {
var last = localStorage.getItem('last-use')
if (last == 'webview' || last == 'noauth') {
last = '0'
}
} else {
var last = "0";
var last = '0'
}
last = last + "";
var sel;
last = last + ''
var sel
if (obj.length < 1) {
$("#src-acct-sel").html('<option value="tootsearch">Tootsearch</option>');
$("#add-acct-sel").html('<option value="noauth">' + lang.lang_login_noauth + '</option>');
$('#src-acct-sel').html('<option value="tootsearch">Tootsearch</option>')
$('#add-acct-sel').html('<option value="noauth">' + lang.lang_login_noauth + '</option>')
} else {
Object.keys(obj).forEach(function (key) {
var acct = obj[key];
var list = key * 1 + 1;
if (key+"" === last) {
sel = "selected";
var domain = acct.domain;
localStorage.setItem("domain_" + key, domain);
if (idata[domain + "_letters"]) {
$("#textarea").attr("data-length", idata[domain + "_letters"])
Object.keys(obj).forEach(function(key) {
var acct = obj[key]
var list = key * 1 + 1
if (key + '' === last) {
sel = 'selected'
var domain = acct.domain
localStorage.setItem('domain_' + key, domain)
if (idata[domain + '_letters']) {
$('#textarea').attr('data-length', idata[domain + '_letters'])
} else {
var maxletters = localStorage.getItem("letters_" + key);
var maxletters = localStorage.getItem('letters_' + key)
if (maxletters > 0) {
$("#textarea").attr("data-length", maxletters)
$('#textarea').attr('data-length', maxletters)
} else {
$("#textarea").attr("data-length", 500)
$('#textarea').attr('data-length', 500)
}
}
if (idata[domain + "_glitch"]) {
$("#local-button").removeClass("hide")
if (idata[domain + '_glitch']) {
$('#local-button').removeClass('hide')
}
var profimg = acct.prof;
localStorage.setItem("prof_" + key, profimg);
var profimg = acct.prof
//localStorage.setItem("prof_" + key, profimg);
if (!profimg) {
profimg = "../../img/missing.svg";
profimg = '../../img/missing.svg'
}
$("#acct-sel-prof").attr("src", profimg);
$('#acct-sel-prof').attr('src', profimg)
if (domain) {
var cc = "(" + domain + ")";
var cc = '(' + domain + ')'
} else {
var cc = "";
var cc = ''
}
$("#toot-post-btn").text(lang.lang_toot + cc);
if (acct.background && acct.background != "def" && acct.text && acct.text != "def") {
$("#toot-post-btn").removeClass("indigo");
$("#toot-post-btn").css("background-color", "#" + acct.background);
$("#toot-post-btn").css("color", acct.text);
$('#toot-post-btn').text(lang.lang_toot + cc)
if (acct.background && acct.background != 'def' && acct.text && acct.text != 'def') {
$('#toot-post-btn').removeClass('indigo')
$('#toot-post-btn').css('background-color', '#' + acct.background)
$('#toot-post-btn').css('color', acct.text)
} else {
}
if (domain == "kirishima.cloud") {
$("#faicon-btn").show();
if (domain == 'kirishima.cloud') {
$('#faicon-btn').show()
} else {
$("#faicon-btn").hide();
$('#faicon-btn').hide()
}
if (domain == "imastodon.net") {
trendTag();
if (domain == 'imastodon.net') {
trendTag()
} else {
$("#trendtag").html("");
$('#trendtag').html('')
}
} else {
sel = "";
sel = ''
}
templete = '<option value="' + key + '" data-icon="' + acct.prof +
'" class="left circle" ' + sel + '>' + acct.user + '@' + acct.domain +
'</option>';
$(".acct-sel").append(templete);
});
$("#src-acct-sel").append('<option value="tootsearch">Tootsearch</option>');
$("#add-acct-sel").append('<option value="noauth">' + lang.lang_login_noauth + '</option><option value="webview">Twitter</option>');
templete =
'<option value="' +
key +
'" data-icon="' +
acct.prof +
'" class="left circle" ' +
sel +
'>' +
acct.user +
'@' +
acct.domain +
'</option>'
$('.acct-sel').append(templete)
})
$('#src-acct-sel').append('<option value="tootsearch">Tootsearch</option>')
$('#add-acct-sel').append(
'<option value="noauth">' +
lang.lang_login_noauth +
'</option><option value="webview">Twitter</option>'
)
$('#dir-acct-sel').append('<option value="noauth">' + lang.lang_login_noauth + '</option>')
}
$('select').formSelect()
if (!parseC) {
parseColumn(null, true)
}
$('select').formSelect();
parseColumn(true);
}
//バージョンエンコ
function enc(ver) {
var ver = ver.replace(/\s/g, "");
var ver = ver.replace(/\(/g, "-");
var ver = ver.replace(/\)/g, "");
var ver = ver.replace(/\[/g, "_");
var ver = ver.replace(/\]/g, "");
return ver;
var ver = ver.replace(/\s/g, '')
var ver = ver.replace(/\(/g, '-')
var ver = ver.replace(/\)/g, '')
var ver = ver.replace(/\[/g, '_')
var ver = ver.replace(/\]/g, '')
return ver
}
//インスタンスティッカー
function ticker() {
var start = "https://toot.app/toot/";
var start = 'https://toot.app/toot/'
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json'
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
console.error(error);
}).then(function (json) {
if (json.error) {
return;
}
if (json) {
localStorage.setItem("ticker", JSON.stringify(json));
}
});
}
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
console.error(error)
})
.then(function(json) {
if (json) {
localStorage.setItem('ticker', JSON.stringify(json))
}
})
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,169 +1,192 @@
//プラットフォーム別 最後に読むやつ
//リンクを外部で開くか内部で出すか
//リンクを外部で開くか内部で出すか
$(document).on('click', 'a', e => {
var $a = $(e.target);
var url = $a.attr('href');
var $a = $(e.target)
var url = $a.attr('href')
if (!url) {
var url = $a.parent().attr('href');
var url = $a.parent().attr('href')
}
var urls = [];
var urls = []
if (url) {
urls = url.match(/https?:\/\/(.+)/);
urls = url.match(/https?:\/\/(.+)/)
//トゥートのURLぽかったら
toot = url.match(/https:\/\/([a-zA-Z0-9.-]+)\/@([a-zA-Z0-9_]+)\/([0-9]+)/);
toot = url.match(/https:\/\/([^+_]+)\/@([a-zA-Z0-9_]+)\/([0-9]+)/)
if (!toot) {
//Pleroma対策
toot = url.match(/https:\/\/([^+_]+)\/users\/([a-zA-Z0-9_]+)\/statuses\/([0-9]+)/)
}
//タグのURLぽかったら
var tags = [];
tags = url.match(
/https:\/\/([-a-zA-Z0-9@.]+)\/tags\/([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#]+)/
);
var tags = []
tags = url.match(/https:\/\/([^+_]+)\/tags\/([_a-zA-Z0-9\&=+\%]+)/)
//メンションっぽかったら
var ats = [];
ats = url.match(
/https:\/\/([-a-zA-Z0-9.]+)\/@([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#@]+)/
);
var ats = []
ats = url.match(/https:\/\/([^+_]+)\/@([_a-zA-Z0-9\&=+\%]+)/)
if (toot) {
if (toot[1]) {
var acct_id = $a.parent().attr("data-acct");
var acct_id = $a.parent().attr('data-acct')
if (!acct_id) {
acct_id = 0;
acct_id = 0
}
$a.parent().addClass("loadp")
$a.parent().text("Loading...")
detEx(url, acct_id);
$a.parent().addClass('loadp')
$a.parent().text('Loading...')
detEx(url, acct_id)
}
} else if (tags) {
if (tags[2]) {
var acct_id = $a.parent().attr("data-acct");
var acct_id = $a.parent().attr('data-acct')
if (!acct_id) {
acct_id = 0;
acct_id = 0
}
tl('tag', decodeURI(tags[2]), acct_id, 'add')
}
} else if (ats) {
if (ats[2]) {
//Quesdon判定
if (!~ats[2].indexOf("@")) {
udgEx(ats[2] + "@" + ats[1], "main");
if (!~ats[2].indexOf('@')) {
udgEx(url, 'main')
return false
} else {
postMessage(["openUrl", url], "*")
postMessage(['openUrl', url], '*')
}
}
} else {
//hrefがhttp/httpsならブラウザで
if (urls) {
if (urls[0]) {
if (~url.indexOf("thedeks.top")) {
if (~url.indexOf('thedeks.top')) {
//alert("If you recieve this alert, let the developer(Cutls@kirishima.cloud) know it with a screenshot.");
url = "https://thedesk.top";
url = 'https://thedesk.top'
}
postMessage(["openUrl", url], "*")
postMessage(['openUrl', url], '*')
} else {
location.href = url;
location.href = url
}
} else {
location.href = url;
location.href = url
}
}
}
return false;
});
return false
})
//よく使うライブラリ
//コピー
function execCopy(string) {
var temp = $("#copy");
temp.val(string);
temp.select();
var result = document.execCommand('copy');
return result;
postMessage(['copy', string], '*')
return true
}
function progshow(e) {
if (e.lengthComputable) {
var percent = e.loaded / e.total;
console.log("Progress: " + percent * 100);
$("#imgsel").hide();
var percent = e.loaded / e.total
console.log('Progress: ' + percent * 100)
$('#imgsel').hide()
if (percent < 1) {
$("#imgup").text(Math.floor(percent * 100) + "%");
$('#imgup').text(Math.floor(percent * 100) + '%')
} else {
$("#imgup").text(lang.lang_progress);
$('#imgup').text(lang.lang_progress)
}
}
}
function opendev() {
var webview = document.getElementById("webview");
webview.openDevTools();
var webview = document.getElementById('webview')
webview.openDevTools()
/*webview.sendInputEvent({
type: "keyDown",
keyCode: '2'
});
*/
}
var soundFile
function playSound() {
window.AudioContext = window.AudioContext || window.webkitAudioContext;
context = new AudioContext();
context.createBufferSource().start(0);
context.decodeAudioData(request.response, function (buf) {
console.log("Playing:" + source)
source.buffer = buf;
source.loop = false;
});
source = context.createBufferSource();
volumeControl = context.createGain();
source.connect(volumeControl);
volumeControl.connect(context.destination);
volumeControl.gain.value = 0.8
source.start(0);
window.AudioContext = window.AudioContext || window.webkitAudioContext
if (soundFile) {
soundFile.stop()
}
context = new AudioContext()
context.createBufferSource().start(0)
context.decodeAudioData(request.response, function(buf) {
//console.log("Playing:" , source)
source.buffer = buf
source.loop = false
})
source = context.createBufferSource()
volumeControl = context.createGain()
source.connect(volumeControl)
volumeControl.connect(context.destination)
var cvol = localStorage.getItem('customVol')
if (cvol) {
vol = cvol
} else {
vol = 0.8
}
volumeControl.gain.value = vol
source.start(0)
soundFile = source
function newFunction() {
var source
return source
}
}
function nano() {
postMessage(["nano", null], "*")
postMessage(['nano', null], '*')
}
onmessage = function (e) {
if (e.data[0] == "details") {
onmessage = function(e) {
if (e.data[0] == 'details') {
details(e.data[1][0], e.data[1][1])
} else if (e.data[0] == "udg") {
} else if (e.data[0] == 'udg') {
udg(e.data[1][0], e.data[1][1])
} else if (e.data[0] == "media") {
media(e.data[1][0], e.data[1][1], e.data[1][2])
} else if (e.data[0] == "post") {
post("pass")
} else if (e.data[0] == "toastSaved") {
M.toast({ html: lang.lang_img_DLDone + e.data[1][0] + '<button class="btn-flat toast-action" onclick="openFinder(\'' + e.data[1][1] + '\')">Show</button>', displayLength: 5000 })
} else if (e.data[0] == "parseColumn") {
parseColumn()
} else if (e.data[0] == "exportSettingsCore") {
exportSettingsCore()
} else if (e.data[0] == "fontList") {
} else if (e.data[0] == 'media') {
media(e.data[1][0], e.data[1][1], e.data[1][2], e.data[1][3])
} else if (e.data[0] == 'post') {
post('pass')
} else if (e.data[0] == 'toastSaved') {
var show = `${lang.lang_img_DLDone}${
e.data[1][0]
}<button class="btn-flat toast-action" onclick="openFinder('${e.data[1][1]}')">Show</button>`
M.toast({ html: show, displayLength: 5000 })
} else if (e.data[0] == 'parseColumn') {
parseColumn(e.data[1])
} else if (e.data[0] == 'exportSettingsCore') {
var exp = exportSettingsCore()
postMessage(['exportSettingsCoreComplete', [e.data[1], exp]], '*')
} else if (e.data[0] == 'importSettingsCore') {
importSettingsCore(e.data[1])
} else if (e.data[0] == 'fontList') {
fontList(e.data[1])
} else if (e.data[0] == "customSoundSave") {
} else if (e.data[0] == 'customSoundSave') {
customSoundSave(e.data[1][0], e.data[1][1])
} else if (e.data[0] == "ctLoadCore") {
} else if (e.data[0] == 'ctLoadCore') {
ctLoadCore(e.data[1])
} else if (e.data[0] == "ctLoad") {
} else if (e.data[0] == 'ctLoad') {
ctLoad()
} else if (e.data[0] == "customConnect") {
} else if (e.data[0] == 'customConnect') {
customConnect(e.data[1])
} else if (e.data[0] == "clearCustomImport") {
} else if (e.data[0] == 'clearCustomImport') {
clearCustomImport()
} else if (e.data[0] == "npCore") {
npCore(e.data[1]);
} else if (e.data[0] == "renderMem") {
} else if (e.data[0] == 'npCore') {
npCore(e.data[1])
} else if (e.data[0] == 'renderMem') {
renderMem(e.data[1][0], e.data[1][1], e.data[1][2])
} else if (e.data[0] == "updateProg") {
updateProg(e.data[1]);
} else if (e.data[0] == "updateMess") {
updateMess(e.data[1]);
} else if (e.data[0] == "renderAbout") {
renderAbout(e.data[1]);
} else if (e.data[0] == "alert") {
} else if (e.data[0] == 'updateProg') {
updateProg(e.data[1])
} else if (e.data[0] == 'updateMess') {
updateMess(e.data[1])
} else if (e.data[0] == 'renderAbout') {
renderAbout(e.data[1])
} else if (e.data[0] == 'asRead') {
asRead()
} else if (e.data[0] == 'asReadEnd') {
asReadEnd()
} else if (e.data[0] == 'logData') {
$('#logs').val(e.data[1])
var obj = document.getElementById('logs')
obj.scrollTop = obj.scrollHeight
} else if (e.data[0] == 'alert') {
Swal.fire({
type: 'info',
title: e.data[1]
})
}
}
}

View File

@@ -1,173 +1,285 @@
$.strip_tags = function (str, allowed) {
document.title = 'TheDesk'
$.strip_tags = function(str, allowed) {
if (!str) {
return "";
return ''
}
allowed = (((allowed || '') + '').toLowerCase().match(/<[a-z][a-z0-9]*>/g) || [])
.join('');
allowed = (((allowed || '') + '').toLowerCase().match(/<[a-z][a-z0-9]*>/g) || []).join('')
var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>?/gi,
commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi;
return str.replace(commentsAndPhpTags, '').replace(tags, function ($0, $1) {
return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : '';
});
};
commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi
return str.replace(commentsAndPhpTags, '').replace(tags, function($0, $1) {
return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : ''
})
}
function escapeHTML(str) {
if (!str) {
return "";
return ''
}
return str.replace(/&/g, '&amp;')
return str
.replace(/&/g, '&amp;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/"/g, '&quot;')
.replace(/'/g, '&#039;');
.replace(/'/g, '&#039;')
}
//PHPのnl2brと同様
function nl2br(str) {
if (!str) {
return "";
return ''
}
str = str.replace(/\r\n/g, "<br />");
str = str.replace(/(\n|\r)/g, "<br />");
return str;
str = str.replace(/\r\n/g, '<br />')
str = str.replace(/(\n|\r)/g, '<br />')
return str
}
function br2nl(str) {
if (!str) {
return "";
return ''
}
str = str.replace(/<br \/>/g, "\r\n");
return str;
str = str.replace(/<br \/>/g, '\r\n')
return str
}
function formattime(date) {
var str = date.getFullYear() + "-";
var str = date.getFullYear() + '-'
if (date.getMonth() + 1 < 10) {
str = str + "0" + (date.getMonth() + 1) + "-";
str = str + '0' + (date.getMonth() + 1) + '-'
} else {
str = str + (date.getMonth() + 1) + "-";
str = str + (date.getMonth() + 1) + '-'
}
if (date.getDate() < 10) {
str = str + "0" + date.getDate()
str = str + '0' + date.getDate()
} else {
str = str + date.getDate()
}
str = str + "T";
str = str + 'T'
if (date.getHours() < 10) {
str = str + "0" + date.getHours() + ":"
str = str + '0' + date.getHours() + ':'
} else {
str = str + date.getHours() + ":"
str = str + date.getHours() + ':'
}
if (date.getMinutes() < 10) {
str = str + "0" + date.getMinutes()
str = str + '0' + date.getMinutes()
} else {
str = str + date.getMinutes()
}
return escapeHTML(str);
return escapeHTML(str)
}
function formattimeutc(date) {
var str = date.getUTCFullYear() + "-";
var str = date.getUTCFullYear() + '-'
if (date.getUTCMonth() + 1 < 10) {
str = str + "0" + (date.getUTCMonth() + 1) + "-";
str = str + '0' + (date.getUTCMonth() + 1) + '-'
} else {
str = str + (date.getUTCMonth() + 1) + "-";
str = str + (date.getUTCMonth() + 1) + '-'
}
if (date.getUTCDate() < 10) {
str = str + "0" + date.getUTCDate()
str = str + '0' + date.getUTCDate()
} else {
str = str + date.getUTCDate()
}
str = str + "T";
str = str + 'T'
if (date.getUTCHours() < 10) {
str = str + "0" + date.getUTCHours() + ":"
str = str + '0' + date.getUTCHours() + ':'
} else {
str = str + date.getUTCHours() + ":"
str = str + date.getUTCHours() + ':'
}
if (date.getUTCMinutes() < 10) {
str = str + "0" + date.getUTCMinutes()
str = str + '0' + date.getUTCMinutes()
} else {
str = str + date.getUTCMinutes()
}
return escapeHTML(str);
return escapeHTML(str)
}
postMessage(["sendSinmpleIpc", "custom-css-request"], "*")
postMessage(['sendSinmpleIpc', 'custom-css-request'], '*')
function makeCID() {
return randomStr(8) + "-" + randomStr(4) + "-" + randomStr(4) + "-" + randomStr(4) + "-" + randomStr(12);
return (
randomStr(8) +
'-' +
randomStr(4) +
'-' +
randomStr(4) +
'-' +
randomStr(4) +
'-' +
randomStr(12)
)
}
function randomStr(l) {
// 生成する文字列に含める文字セット
var c = "abcdefghijklmnopqrstuvwxyz0123456789";
var cl = c.length;
var r = "";
var c = 'abcdefghijklmnopqrstuvwxyz0123456789'
var cl = c.length
var r = ''
for (var i = 0; i < l; i++) {
r += c[Math.floor(Math.random() * cl)];
r += c[Math.floor(Math.random() * cl)]
}
return r;
return r
}
function rgbToHex(color) {
// HEXに変換したものを代入する変数
var hex = '';
var hex = ''
// 第1引数がHEXのとき変換処理は必要ないのでそのままreturn
// IE8の場合はjQueryのcss()関数でHEXを返すので除外
if (color.match(/^#[a-f\d]{3}$|^#[a-f\d]{6}$/i)) {
return color;
return color
}
// 正規表現
var regex = color.match(/^rgb\(([0-9.]+),\s*([0-9.]+),\s*([0-9.]+)\)$/);
var regex = color.match(/^rgb\(([0-9.]+),\s*([0-9.]+),\s*([0-9.]+)\)$/)
// 正規表現でマッチしたとき
if (regex) {
var rgb =
[
// RGBからHEXへ変換
parseInt(regex[1]).toString(16),
parseInt(regex[2]).toString(16),
parseInt(regex[3]).toString(16)
];
var rgb = [
// RGBからHEXへ変換
parseInt(regex[1]).toString(16),
parseInt(regex[2]).toString(16),
parseInt(regex[3]).toString(16)
]
for (var i = 0; i < rgb.length; ++i) {
// rgb(1,1,1)のようなときHEXに変換すると1桁になる
// 1桁のときは前に0を足す
if (rgb[i].length == 1) {
rgb[i] = '0' + rgb[i];
rgb[i] = '0' + rgb[i]
}
hex += rgb[i];
hex += rgb[i]
}
return hex;
return hex
}
console.error(color + ':第1引数はRGB形式で入力');
console.error(color + ':第1引数はRGB形式で入力')
}
/*マルチバイト用切り出し*/
$.isSurrogatePear = function (upper, lower) {
return 0xD800 <= upper && upper <= 0xDBFF && 0xDC00 <= lower && lower <= 0xDFFF;
};
$.mb_strlen = function (str) {
var ret = 0;
for (var i = 0; i < str.length; i++ , ret++) {
var upper = str.charCodeAt(i);
var lower = str.length > (i + 1) ? str.charCodeAt(i + 1) : 0;
if ($.isSurrogatePear(upper, lower)) {
i++;
$.isSurrogatePear = function(upper, lower) {
return 0xd800 <= upper && upper <= 0xdbff && 0xdc00 <= lower && lower <= 0xdfff
}
$.mb_strlen = function(str) {
var splitter = new GraphemeSplitter()
var arr = splitter.splitGraphemes(str)
return arr.length
}
$.mb_substr = function(str, begin, end) {
//配列にする
var splitter = new GraphemeSplitter()
var arr = splitter.splitGraphemes(str)
var newarr = []
for (var i = 0; i < arr.length; i++) {
if (i >= begin && i <= end) {
newarr.push(arr[i])
}
}
return ret;
};
$.mb_substr = function (str, begin, end) {
var ret = '';
for (var i = 0, len = 0; i < str.length; i++ , len++) {
var upper = str.charCodeAt(i);
var lower = str.length > (i + 1) ? str.charCodeAt(i + 1) : 0;
var s = '';
if ($.isSurrogatePear(upper, lower)) {
i++;
s = String.fromCharCode(upper, lower);
return newarr.join('')
}
//ソートするやつ
function object_array_sort(data, key, order, fn) {
var num_a = -1
var num_b = 1
if (order === 'asc') {
num_a = 1
num_b = -1
}
data = data.sort(function(a, b) {
var x = a[key]
var y = b[key]
if (x > y) return num_a
if (x < y) return num_b
return 0
})
var arrObj = {}
for (var i = 0; i < data.length; i++) {
arrObj[data[i]['family']] = data[i]
}
data = []
for (var key in arrObj) {
data.push(arrObj[key])
}
fn(data)
}
function setLog(txt1, txt2, txt3) {
//url,statuscode,responsetext
var text = new Date().toUTCString()
text = text + ',' + txt1 + ',' + txt2 + ',' + escapeCsv(txt3)
console.error(text)
postMessage(['log', text], '*')
}
function escapeCsv(str) {
if (!str) {
return str
}
var result
result = str.replace(/\"/g, '""')
if (result.indexOf(',') >= 0) {
result = '"' + result + '"'
}
return result
}
function evalAttr(json, attr, lenCk) {
if (json[attr]) {
if (lenCk) {
if (json[attr][0]) {
return true
} else {
return false
}
} else {
s = String.fromCharCode(upper);
}
if (begin <= len && len < end) {
ret += s;
return true
}
} else {
return false
}
return ret;
};
localStorage.removeItem("errors");
}
function statusModel(now) {
if (!now) {
var now = new Date().toString()
}
return {
id: '',
created_at: now,
in_reply_to_id: null,
in_reply_to_account_id: null,
sensitive: false,
spoiler_text: '',
visibility: 'public',
language: 'en',
uri: '',
url: '',
replies_count: 0,
reblogs_count: 0,
favourites_count: 0,
favourited: false,
reblogged: false,
muted: false,
bookmarked: false,
pinned: false,
content: '<p><i>No status here</i></p>',
reblog: null,
application: {
name: null,
website: null
},
account: {
id: '',
username: '',
acct: '',
display_name: '',
locked: false,
bot: false,
created_at: now,
note: '',
url: '',
avatar: '',
avatar_static: '',
header: '',
header_static: '',
followers_count: 0,
following_count: 0,
statuses_count: 0,
last_status_at: now,
emojis: [],
fields: []
},
media_attachments: [],
mentions: [],
tags: [],
card: null,
poll: null
}
}

View File

@@ -1,136 +1,263 @@
//TL取得
var websocket
function tl(data) {
var tlid = 0;
var acct_id = $("#post-acct-sel").val();
var type = $("#type-sel").val();
var domain = localStorage.getItem("domain_" + acct_id);
var tlid = 0
if (websocket) {
websocket.close()
}
var acct_id = $('#post-acct-sel').val()
var type = $('#type-sel').val()
var domain = localStorage.getItem('domain_' + acct_id)
//タグの場合はカラム追加して描画
if (!type) {
//デフォルト
var type = "local";
var type = 'local'
}
var at = localStorage.getItem("acct_" + acct_id + "_at");
$("#notice_nano").text(cap(type, data) + " TL(" + localStorage.getItem(
"user_" + acct_id) + "@" + domain + ")");
var start = "https://" + domain + "/api/v1/timelines/" + com(type, data);
var at = localStorage.getItem('acct_' + acct_id + '_at')
$('#notice_nano').text(
cap(type, data) + ' TL(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
)
var start = 'https://' + domain + '/api/v1/timelines/' + com(type, data)
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
console.error(error);
}).then(function (json) {
var templete = parse([json[0]], '', acct_id, tlid);
$("#timeline_nano").html(templete);
jQuery("time.timeago").timeago();
});
Authorization: 'Bearer ' + at
}
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
console.error(error)
})
.then(function(json) {
var templete = parse([json[0]], '', acct_id, tlid)
$('#timeline_nano').html(templete)
jQuery('time.timeago').timeago()
$('#menu').addClass('hide')
})
//Streaming接続
var websocket = [];
var tlid = 0;
if (type == "home") {
var start = "wss://" + domain +
"/api/v1/streaming/?stream=user&access_token=" + at;
} else if (type == "pub") {
var start = "wss://" + domain +
"/api/v1/streaming/?stream=public&access_token=" + at;
} else if (type == "local") {
var start = "wss://" + domain +
"/api/v1/streaming/?stream=public:local&access_token=" + at;
} else if (type == "tag") {
var start = "wss://" + domain +
"/api/v1/streaming/?stream=hashtag&tag=" + data + "&access_token=" + at;
var tlid = 0
if (type == 'home') {
var start = 'wss://' + domain + '/api/v1/streaming/?stream=user&access_token=' + at
} else if (type == 'pub') {
var start = 'wss://' + domain + '/api/v1/streaming/?stream=public&access_token=' + at
} else if (type == 'local') {
var start = 'wss://' + domain + '/api/v1/streaming/?stream=public:local&access_token=' + at
} else if (type == 'tag') {
var start =
'wss://' + domain + '/api/v1/streaming/?stream=hashtag&tag=' + data + '&access_token=' + at
}
var wsid = websocket.length;
websocket[wsid] = new WebSocket(start);
websocket[wsid].onopen = function (mess) {
$("#notice_icon_" + tlid).removeClass("red-text");
websocket = new WebSocket(start)
websocket.onopen = function(mess) {
$('#notice_icon_' + tlid).removeClass('red-text')
}
websocket[wsid].onmessage = function (mess) {
var typeA = JSON.parse(mess.data).event;
if (typeA == "delete") {
var obj = JSON.parse(mess.data).payload;
$("[toot-id=" + JSON.parse(mess.data).payload + "]").hide();
$("[toot-id=" + JSON.parse(mess.data).payload + "]").remove();
} else if (typeA == "update") {
var obj = JSON.parse(JSON.parse(mess.data).payload);
var templete = parse([obj], '', acct_id, tlid);
$("#timeline_nano").html(templete);
}
websocket[wsid].onclose = function (mess) {
console.error("Close Streaming API:" + type);
websocket.onmessage = function(mess) {
var typeA = JSON.parse(mess.data).event
if (typeA == 'update') {
var obj = JSON.parse(JSON.parse(mess.data).payload)
var templete = parse([obj], '', acct_id, tlid)
jQuery('time.timeago').timeago()
$('#timeline_nano').html(templete)
}
}
websocket[wsid].onerror = function (error) {
console.error('WebSocket Error ' + error);
};
websocket.onerror = function(error) {
console.error('WebSocket Error ' + error)
}
websocket.onclose = function(mess) {
console.error('Close Streaming API:' + type)
}
}
//TLのタイトル
function cap(type, data) {
if (type == "home") {
return "Home"
} else if (type == "local") {
return "Local"
} else if (type == "pub") {
return "Public"
} else if (type == "tag") {
return "#" + data
} else if (type == "list") {
return "List(id:" + data + ")"
} else if (type == "notf") {
return "Notification"
if (type == 'home') {
return 'Home'
} else if (type == 'local') {
return 'Local'
} else if (type == 'pub') {
return 'Public'
} else if (type == 'tag') {
return '#' + data
} else if (type == 'list') {
return 'List(id:' + data + ')'
} else if (type == 'notf') {
return 'Notification'
}
}
//TLのURL
function com(type, data) {
if (type == "home") {
return "home?"
} else if (type == "local") {
return "public?local=true&"
} else if (type == "pub") {
return "public?"
} else if (type == "tag") {
return "tag/" + data + "?"
if (type == 'home') {
return 'home?'
} else if (type == 'local') {
return 'public?local=true&'
} else if (type == 'pub') {
return 'public?'
} else if (type == 'tag') {
return 'tag/' + data + '?'
}
if (type == "list") {
return "list/" + data + "?"
if (type == 'list') {
return 'list/' + data + '?'
}
}
//TLのアイコン
function icon(type) {
if (type == "home") {
return "home"
} else if (type == "local") {
return "people_outline"
} else if (type == "pub") {
return "language"
} else if (type == "tag") {
return "search"
if (type == 'home') {
return 'home'
} else if (type == 'local') {
return 'people_outline'
} else if (type == 'pub') {
return 'language'
} else if (type == 'tag') {
return 'search'
}
if (type == "list") {
return "subject"
if (type == 'list') {
return 'subject'
}
}
function todo() { }
function todc() { }
function hide() { }
$(function ($) {
function todo() {}
function todc() {}
function hide() {}
$(function($) {
//キーボードショートカット
$(window).keydown(function (e) {
var hasFocus = $('input').is(':focus');
var hasFocus2 = $('textarea').is(':focus');
$(window).keydown(function(e) {
var hasFocus = $('input').is(':focus')
var hasFocus2 = $('textarea').is(':focus')
//Ctrl+Enter:投稿
if (event.ctrlKey) {
if (e.keyCode === 13) {
post();
return false;
post()
return false
}
}
});
});
})
})
function set() {
$('#menu').toggleClass('hide')
if ($('#menu').hasClass('hide')) {
$('#setting').text('Setting')
} else {
$('#setting').text('Close')
}
}
var multi = localStorage.getItem('multi')
if (!multi) {
var obj = [
{
at: localStorage.getItem(localStorage.getItem('domain_' + acct_id) + '_at'),
name: localStorage.getItem('name_' + acct_id),
domain: localStorage.getItem('domain_' + acct_id),
user: localStorage.getItem('user_' + acct_id),
prof: localStorage.getItem('prof_' + acct_id)
}
]
var json = JSON.stringify(obj)
localStorage.setItem('multi', json)
} else {
var obj = JSON.parse(multi)
}
var templete
var last = localStorage.getItem('last-use')
var sel
Object.keys(obj).forEach(function(key) {
var acct = obj[key]
var list = key * 1 + 1
if (key == last) {
sel = 'selected'
} else {
sel = ''
}
templete = `<option value="${key}" ${sel}>${acct.user}@${acct.domain}</option>`
$('#post-acct-sel').append(templete)
})
function mov() {
return false
}
function resetmv() {
return false
}
function post() {
var acct_id = $('#post-acct-sel').val()
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/v1/statuses'
var str = $('#textarea').val()
var toot = {
status: str
}
var vis = loadVis(acct_id)
toot.visibility = vis
var httpreq = new XMLHttpRequest()
httpreq.open('POST', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json'
httpreq.send(JSON.stringify(toot))
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
if (this.status !== 200) {
setLog(start, this.status, this.response)
}
$('#textarea').val('')
}
}
}
function loadVis(acct_id) {
var vist = localStorage.getItem('vis')
if (!vist) {
return 'public'
} else {
if (vist == 'memory') {
var memory = localStorage.getItem('vis-memory-' + acct_id)
if (!memory) {
memory = 'public'
}
return memory
} else if (vist == 'server' || vist == 'useapi') {
var multi = localStorage.getItem('multi')
var obj = JSON.parse(multi)
var memory = obj[acct_id]['vis']
if (!memory) {
memory = 'public'
}
return memory
} else {
return vist
}
}
}
function loader() {
var acct_id = $('#post-acct-sel').val()
console.log(loadVis(acct_id))
$('#vis-sel').val(loadVis(acct_id))
}
loader()
$('textarea').height(15) //init
$('textarea').css('lineHeight', '1rem') //init
$('textarea').on('input', function(evt) {
if (evt.target.scrollHeight > evt.target.offsetHeight) {
$(evt.target).height(evt.target.scrollHeight)
} else {
var lineHeight = Number(
$(evt.target)
.css('lineHeight')
.split('px')[0]
)
while (true) {
$(evt.target).height($(evt.target).height() - lineHeight)
if (evt.target.scrollHeight > evt.target.offsetHeight) {
$(evt.target).height(evt.target.scrollHeight)
break
}
}
}
})

View File

@@ -1,174 +1,222 @@
var electron = require("electron");
const shell = electron.shell;
var ipc = electron.ipcRenderer;
onmessage = function (e) {
if (e.data[0] == "openUrl") {
urls = e.data[1].match(/https?:\/\/(.+)/);
if (urls) {
shell.openExternal(e.data[1]);
}
} else if (e.data[0] == "sendSinmpleIpc") {
ipc.send(e.data[1], "")
} else if (e.data[0] == "dialogStore") {
ipc.send("dialogStore", e.data[1])
} else if (e.data[0] == "bmpImage") {
ipc.send('bmp-image', e.data[1]);
} else if (e.data[0] == "dialogCW") {
ipc.send("dialogCW", e.data[1])
} else if (e.data[0] == "nativeNotf") {
console.log(e.data[1])
ipc.send('native-notf', e.data[1]);
} else if (e.data[0] == "dialogClient") {
ipc.send("dialogClient", e.data[1])
} else if (e.data[0] == "generalDL") {
ipc.send('general-dl', e.data[1]);
} else if (e.data[0] == "openFinder") {
ipc.send('open-finder', e.data[1]);
} else if (e.data[0] == "columnDel") {
ipc.send('column-del', e.data[1]);
} else if (e.data[0] == "lang") {
ipc.send('lang', e.data[1]);
} else if (e.data[0] == "exportSettings") {
ipc.send('exportSettings', e.data[1]);
} else if (e.data[0] == "importSettings") {
ipc.send('importSettings', e.data[1]);
} else if (e.data[0] == "customSound") {
ipc.send('customSound', e.data[1]);
} else if (e.data[0] == "themeJsonDelete") {
ipc.send('theme-json-delete', e.data[1]);
} else if (e.data[0] == "themeJsonCreate") {
ipc.send('theme-json-create', e.data[1]);
} else if (e.data[0] == "themeJsonRequest") {
ipc.send('theme-json-request', e.data[1]);
} else if (e.data[0] == "ha") {
ipc.send('ha', e.data[1]);
} else if (e.data[0] == "aboutData") {
ipc.send('aboutData', "");
} else if (e.data[0] == "itunes") {
console.log("NowPlaying" + ipc.listenerCount('itunes-np'))
if (ipc.listenerCount('itunes-np') > 1) {
return false;
} else {
ipc.send("itunes", e.data[1])
}
} else if (e.data[0] == "themeCSSRequest") {
ipc.send('theme-css-request', e.data[1]);
} else if (e.data[0] == "downloadButton") {
ipc.send('download-btn', e.data[1]);
} else if (e.data[0] == "nano") {
ipc.send('nano', null);
}
var electron = require('electron')
const shell = electron.shell
var ipc = electron.ipcRenderer
onmessage = function(e) {
if (e.data[0] == 'openUrl') {
urls = e.data[1].match(/https?:\/\/(.+)/)
if (urls) {
shell.openExternal(e.data[1])
}
} else if (e.data[0] == 'sendSinmpleIpc') {
ipc.send(e.data[1], '')
} else if (e.data[0] == 'dialogStore') {
ipc.send('dialogStore', e.data[1])
} else if (e.data[0] == 'bmpImage') {
ipc.send('bmp-image', e.data[1])
} else if (e.data[0] == 'resizeImage') {
ipc.send('resize-image', e.data[1])
} else if (e.data[0] == 'stampImage') {
ipc.send('stamp-image', e.data[1])
} else if (e.data[0] == 'dialogCW') {
ipc.send('dialogCW', e.data[1])
} else if (e.data[0] == 'nativeNotf') {
console.log(e.data[1])
ipc.send('native-notf', e.data[1])
} else if (e.data[0] == 'dialogClient') {
ipc.send('dialogClient', e.data[1])
} else if (e.data[0] == 'generalDL') {
ipc.send('general-dl', e.data[1])
} else if (e.data[0] == 'openFinder') {
ipc.send('open-finder', e.data[1])
} else if (e.data[0] == 'columnDel') {
ipc.send('column-del', e.data[1])
} else if (e.data[0] == 'lang') {
ipc.send('lang', e.data[1])
} else if (e.data[0] == 'exportSettings') {
ipc.send('exportSettings', e.data[1])
} else if (e.data[0] == 'exportSettingsCoreComplete') {
ipc.send('export', e.data[1])
} else if (e.data[0] == 'importSettings') {
ipc.send('importSettings', e.data[1])
} else if (e.data[0] == 'customSound') {
ipc.send('customSound', e.data[1])
} else if (e.data[0] == 'themeJsonDelete') {
ipc.send('theme-json-delete', e.data[1])
} else if (e.data[0] == 'themeJsonCreate') {
ipc.send('theme-json-create', e.data[1])
} else if (e.data[0] == 'themeJsonRequest') {
ipc.send('theme-json-request', e.data[1])
} else if (e.data[0] == 'ha') {
ipc.send('ha', e.data[1])
} else if (e.data[0] == 'ua') {
ipc.send('ua', e.data[1])
} else if (e.data[0] == 'aboutData') {
ipc.send('aboutData', '')
} else if (e.data[0] == 'itunes') {
console.log('NowPlaying')
ipc.send('itunes', e.data[1])
} else if (e.data[0] == 'themeCSSRequest') {
ipc.send('theme-css-request', e.data[1])
} else if (e.data[0] == 'customCSSRequest') {
ipc.send('custom-css-request', e.data[1])
} else if (e.data[0] == 'downloadButton') {
ipc.send('download-btn', e.data[1])
} else if (e.data[0] == 'nano') {
ipc.send('nano', null)
} else if (e.data[0] == 'asReadComp') {
ipc.send('sendMarkersComplete', null)
} else if (e.data[0] == 'copy') {
ipc.send('copy', e.data[1])
} else if (e.data[0] == 'log') {
ipc.send('log', e.data[1])
}
}
//version.js
ipc.send("getPlatform", "")
ipc.on('platform', function (event, args) {
localStorage.setItem("platform", args[0])
localStorage.setItem("bit", args[1])
localStorage.setItem("about", JSON.stringify([args[2], args[3], args[4]]))
ipc.send('getPlatform', '')
ipc.on('platform', function(event, args) {
localStorage.setItem('platform', args[0])
localStorage.setItem('bit', args[1])
localStorage.setItem('about', JSON.stringify([args[2], args[3], args[4], args[5]]))
})
ipc.on('reload', function (event, arg) {
location.reload();
ipc.on('reload', function(event, arg) {
location.reload()
})
//Native Notf
ipc.on('shownotf', function (event, args) {
if (args["type"] == "toot") {
postMessage(["details", [id, acct_id]], "*")
} else if (args["type"] == "userdata") {
postMessage(["udg", [user, acct_id]], "*")
}
ipc.on('shownotf', function(event, args) {
if (args['type'] == 'toot') {
postMessage(['details', [id, acct_id]], '*')
} else if (args['type'] == 'userdata') {
postMessage(['udg', [user, acct_id]], '*')
}
})
//first.js
ipc.on('custom-css-response', function (event, arg) {
if (arg == "") { return false; }
var styleNode = document.createElement("style");
styleNode.setAttribute("type", "text/css")
ipc.on('custom-css-response', function(event, arg) {
if (arg == '') {
return false
}
var styleNode = document.createElement('style')
styleNode.setAttribute('type', 'text/css')
var content = document.createTextNode(arg)
styleNode.append(content)
document.getElementsByTagName("head")[0].append(styleNode)
var content = document.createTextNode(arg)
styleNode.append(content)
document.getElementsByTagName('head')[0].append(styleNode)
})
ipc.on('theme-css-response', function (event, arg) {
if (arg == "") { return false; }
var styleNode = document.createElement("style");
styleNode.setAttribute("type", "text/css")
ipc.on('theme-css-response', function(event, arg) {
if (arg == '') {
return false
}
var styleNode = document.createElement('style')
styleNode.setAttribute('type', 'text/css')
var content = document.createTextNode(arg)
styleNode.append(content)
document.getElementsByTagName("head")[0].append(styleNode)
var content = document.createTextNode(arg)
styleNode.append(content)
document.getElementsByTagName('head')[0].append(styleNode)
})
//img.js
ipc.on('bmp-img-comp', function (event, b64) {
postMessage(["media", [b64[0], "image/png", b64[1]]], "*")
});
//ui,img.js
ipc.on('general-dl-prog', function (event, arg) {
console.log("Progress: " + arg);
ipc.on('bmp-img-comp', function(event, b64) {
if (b64[2]) {
var stamped = true
} else {
var stamped = false
}
postMessage(['media', [b64[0], 'image/png', b64[1], stamped]], '*')
})
ipc.on('general-dl-message', function (event, arg) {
var argC = arg.replace(/\\/g, "\\\\") + "\\\\.";
console.log("saved")
postMessage(["toastSaved", [arg, argC]], "*")
ipc.on('resizeJudgement', function(event, b64) {
var resize = localStorage.getItem('uploadCrop') * 1
if (resize > 0) {
var element = new Image()
var width
element.onload = function() {
var width = element.naturalWidth
var height = element.naturalHeight
if (width > resize || height > resize) {
ipc.send('resize-image', [b64, resize])
} else {
postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
}
}
element.src = b64
} else {
postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
}
})
//ui,img.js
ipc.on('general-dl-prog', function(event, arg) {
console.log('Progress: ' + arg)
})
ipc.on('general-dl-message', function(event, arg) {
var argC = arg.replace(/\\/g, '\\\\') + '\\\\.'
console.log('saved')
postMessage(['toastSaved', [arg, argC]], '*')
})
//setting.js
ipc.on('langres', function (event, arg) {
location.href = "../" + lang + "/setting.html"
});
ipc.on('exportSettingsFile', function (event, savedFiles) {
var exp = exportSettingsCore()
ipc.send('export', [savedFiles, JSON.stringify(exp)]);
postMessage(["alert", "Done"], "*")
//cards
//lang
});
ipc.on('config', function (event, arg) {
postMessage(["importSettingsCore", arg], "*")
});
ipc.on('savefolder', function (event, arg) {
localStorage.setItem("savefolder", arg);
});
ipc.on('font-list', function (event, arg) {
postMessage(["fontList", arg], "*")
});
ipc.on('customSoundRender', function (event, args) {
postMessage(["customSoundSave", [args[0], args[1]]], "*")
});
ipc.on('theme-json-list-response', function (event, args) {
postMessage(["ctLoadCore", args], "*")
});
ipc.on('theme-json-delete-complete', function (event, args) {
postMessage(["ctLoad", ""], "*")
});
ipc.on('theme-json-response', function (event, args) {
postMessage(["customConnect", args], "*")
});
ipc.on('theme-json-create-complete', function (event, args) {
postMessage(["clearCustomImport", ""], "*")
postMessage(["ctLoad", ""], "*")
});
ipc.on('langres', function(event, arg) {
location.href = '../' + arg + '/setting.html'
})
ipc.on('exportSettingsFile', function(event, arg) {
postMessage(['exportSettingsCore', arg], '*')
})
ipc.on('exportAllComplete', function(event, arg) {
postMessage(['alert', 'Complete'], '*')
})
ipc.on('config', function(event, arg) {
postMessage(['importSettingsCore', arg], '*')
})
ipc.on('savefolder', function(event, arg) {
localStorage.setItem('savefolder', arg)
})
ipc.on('font-list', function(event, arg) {
postMessage(['fontList', arg], '*')
})
ipc.on('customSoundRender', function(event, args) {
postMessage(['customSoundSave', [args[0], args[1]]], '*')
})
ipc.on('theme-json-list-response', function(event, args) {
postMessage(['ctLoadCore', args], '*')
})
ipc.on('theme-json-delete-complete', function(event, args) {
postMessage(['ctLoad', ''], '*')
})
ipc.on('theme-json-response', function(event, args) {
postMessage(['customConnect', args], '*')
})
ipc.on('theme-json-create-complete', function(event, args) {
postMessage(['clearCustomImport', ''], '*')
postMessage(['ctLoad', ''], '*')
})
//spotify.js
ipc.once('itunes-np', function (event, arg) {
postMessage(["npCore", arg], "*")
ipc.on('itunes-np', function(event, arg) {
postMessage(['npCore', arg], '*')
})
//tips.js
ipc.on('memory', function (event, arg) {
var use = arg[0];
var cpu = arg[1];
var total = arg[2]
postMessage(["renderMem", [use, cpu, total]], "*")
ipc.on('memory', function(event, arg) {
var use = arg[0]
var cpu = arg[1]
var total = arg[2]
postMessage(['renderMem', [use, cpu, total]], '*')
})
//log
ipc.on('logData', function(event, args) {
postMessage(['logData', args], '*')
})
//update.html
ipc.on('prog', function (event, arg) {
console.log(arg)
postMessage(["updateProg", arg], "*")
ipc.on('prog', function(event, arg) {
postMessage(['updateProg', arg], '*')
})
ipc.on('mess', function (event, arg) {
postMessage(["updateMess", arg], "*")
ipc.on('mess', function(event, arg) {
postMessage(['updateMess', arg], '*')
})
var webviewDom = document.getElementById('webview');
ipc.on('asRead', function(event, arg) {
postMessage(['asRead', ''], '*')
})
ipc.on('asReadEnd', function(event, arg) {
postMessage(['asReadEnd', ''], '*')
})
var webviewDom = document.getElementById('webview')
if (webviewDom) {
webviewDom.addEventListener('new-window', function (e) {
shell.openExternal(e.url);
});
webviewDom.addEventListener('new-window', function(e) {
shell.openExternal(e.url)
})
}

508
app/js/platform/punycode.js Normal file
View File

@@ -0,0 +1,508 @@
/*! https://mths.be/punycode v1.4.1 by @mathias */
;(function(root) {
/** Detect free variables */
var freeExports = typeof exports == 'object' && exports && !exports.nodeType && exports
var freeModule = typeof module == 'object' && module && !module.nodeType && module
var freeGlobal = typeof global == 'object' && global
if (
freeGlobal.global === freeGlobal ||
freeGlobal.window === freeGlobal ||
freeGlobal.self === freeGlobal
) {
root = freeGlobal
}
/**
* The `punycode` object.
* @name punycode
* @type Object
*/
var punycode,
/** Highest positive signed 32-bit float value */
maxInt = 2147483647, // aka. 0x7FFFFFFF or 2^31-1
/** Bootstring parameters */
base = 36,
tMin = 1,
tMax = 26,
skew = 38,
damp = 700,
initialBias = 72,
initialN = 128, // 0x80
delimiter = '-', // '\x2D'
/** Regular expressions */
regexPunycode = /^xn--/,
regexNonASCII = /[^\x20-\x7E]/, // unprintable ASCII chars + non-ASCII chars
regexSeparators = /[\x2E\u3002\uFF0E\uFF61]/g, // RFC 3490 separators
/** Error messages */
errors = {
overflow: 'Overflow: input needs wider integers to process',
'not-basic': 'Illegal input >= 0x80 (not a basic code point)',
'invalid-input': 'Invalid input'
},
/** Convenience shortcuts */
baseMinusTMin = base - tMin,
floor = Math.floor,
stringFromCharCode = String.fromCharCode,
/** Temporary variable */
key
/*--------------------------------------------------------------------------*/
/**
* A generic error utility function.
* @private
* @param {String} type The error type.
* @returns {Error} Throws a `RangeError` with the applicable error message.
*/
function error(type) {
throw new RangeError(errors[type])
}
/**
* A generic `Array#map` utility function.
* @private
* @param {Array} array The array to iterate over.
* @param {Function} callback The function that gets called for every array
* item.
* @returns {Array} A new array of values returned by the callback function.
*/
function map(array, fn) {
var length = array.length
var result = []
while (length--) {
result[length] = fn(array[length])
}
return result
}
/**
* A simple `Array#map`-like wrapper to work with domain name strings or email
* addresses.
* @private
* @param {String} domain The domain name or email address.
* @param {Function} callback The function that gets called for every
* character.
* @returns {Array} A new string of characters returned by the callback
* function.
*/
function mapDomain(string, fn) {
var parts = string.split('@')
var result = ''
if (parts.length > 1) {
// In email addresses, only the domain name should be punycoded. Leave
// the local part (i.e. everything up to `@`) intact.
result = parts[0] + '@'
string = parts[1]
}
// Avoid `split(regex)` for IE8 compatibility. See #17.
string = string.replace(regexSeparators, '\x2E')
var labels = string.split('.')
var encoded = map(labels, fn).join('.')
return result + encoded
}
/**
* Creates an array containing the numeric code points of each Unicode
* character in the string. While JavaScript uses UCS-2 internally,
* this function will convert a pair of surrogate halves (each of which
* UCS-2 exposes as separate characters) into a single code point,
* matching UTF-16.
* @see `punycode.ucs2.encode`
* @see <https://mathiasbynens.be/notes/javascript-encoding>
* @memberOf punycode.ucs2
* @name decode
* @param {String} string The Unicode input string (UCS-2).
* @returns {Array} The new array of code points.
*/
function ucs2decode(string) {
var output = [],
counter = 0,
length = string.length,
value,
extra
while (counter < length) {
value = string.charCodeAt(counter++)
if (value >= 0xd800 && value <= 0xdbff && counter < length) {
// high surrogate, and there is a next character
extra = string.charCodeAt(counter++)
if ((extra & 0xfc00) == 0xdc00) {
// low surrogate
output.push(((value & 0x3ff) << 10) + (extra & 0x3ff) + 0x10000)
} else {
// unmatched surrogate; only append this code unit, in case the next
// code unit is the high surrogate of a surrogate pair
output.push(value)
counter--
}
} else {
output.push(value)
}
}
return output
}
/**
* Creates a string based on an array of numeric code points.
* @see `punycode.ucs2.decode`
* @memberOf punycode.ucs2
* @name encode
* @param {Array} codePoints The array of numeric code points.
* @returns {String} The new Unicode string (UCS-2).
*/
function ucs2encode(array) {
return map(array, function(value) {
var output = ''
if (value > 0xffff) {
value -= 0x10000
output += stringFromCharCode(((value >>> 10) & 0x3ff) | 0xd800)
value = 0xdc00 | (value & 0x3ff)
}
output += stringFromCharCode(value)
return output
}).join('')
}
/**
* Converts a basic code point into a digit/integer.
* @see `digitToBasic()`
* @private
* @param {Number} codePoint The basic numeric code point value.
* @returns {Number} The numeric value of a basic code point (for use in
* representing integers) in the range `0` to `base - 1`, or `base` if
* the code point does not represent a value.
*/
function basicToDigit(codePoint) {
if (codePoint - 48 < 10) {
return codePoint - 22
}
if (codePoint - 65 < 26) {
return codePoint - 65
}
if (codePoint - 97 < 26) {
return codePoint - 97
}
return base
}
/**
* Converts a digit/integer into a basic code point.
* @see `basicToDigit()`
* @private
* @param {Number} digit The numeric value of a basic code point.
* @returns {Number} The basic code point whose value (when used for
* representing integers) is `digit`, which needs to be in the range
* `0` to `base - 1`. If `flag` is non-zero, the uppercase form is
* used; else, the lowercase form is used. The behavior is undefined
* if `flag` is non-zero and `digit` has no uppercase form.
*/
function digitToBasic(digit, flag) {
// 0..25 map to ASCII a..z or A..Z
// 26..35 map to ASCII 0..9
return digit + 22 + 75 * (digit < 26) - ((flag != 0) << 5)
}
/**
* Bias adaptation function as per section 3.4 of RFC 3492.
* https://tools.ietf.org/html/rfc3492#section-3.4
* @private
*/
function adapt(delta, numPoints, firstTime) {
var k = 0
delta = firstTime ? floor(delta / damp) : delta >> 1
delta += floor(delta / numPoints)
for (; /* no initialization */ delta > (baseMinusTMin * tMax) >> 1; k += base) {
delta = floor(delta / baseMinusTMin)
}
return floor(k + ((baseMinusTMin + 1) * delta) / (delta + skew))
}
/**
* Converts a Punycode string of ASCII-only symbols to a string of Unicode
* symbols.
* @memberOf punycode
* @param {String} input The Punycode string of ASCII-only symbols.
* @returns {String} The resulting string of Unicode symbols.
*/
function decode(input) {
// Don't use UCS-2
var output = [],
inputLength = input.length,
out,
i = 0,
n = initialN,
bias = initialBias,
basic,
j,
index,
oldi,
w,
k,
digit,
t,
/** Cached calculation results */
baseMinusT
// Handle the basic code points: let `basic` be the number of input code
// points before the last delimiter, or `0` if there is none, then copy
// the first basic code points to the output.
basic = input.lastIndexOf(delimiter)
if (basic < 0) {
basic = 0
}
for (j = 0; j < basic; ++j) {
// if it's not a basic code point
if (input.charCodeAt(j) >= 0x80) {
error('not-basic')
}
output.push(input.charCodeAt(j))
}
// Main decoding loop: start just after the last delimiter if any basic code
// points were copied; start at the beginning otherwise.
for (index = basic > 0 ? basic + 1 : 0; index < inputLength /* no final expression */; ) {
// `index` is the index of the next character to be consumed.
// Decode a generalized variable-length integer into `delta`,
// which gets added to `i`. The overflow checking is easier
// if we increase `i` as we go, then subtract off its starting
// value at the end to obtain `delta`.
for (oldi = i, w = 1, k = base /* no condition */; ; k += base) {
if (index >= inputLength) {
error('invalid-input')
}
digit = basicToDigit(input.charCodeAt(index++))
if (digit >= base || digit > floor((maxInt - i) / w)) {
error('overflow')
}
i += digit * w
t = k <= bias ? tMin : k >= bias + tMax ? tMax : k - bias
if (digit < t) {
break
}
baseMinusT = base - t
if (w > floor(maxInt / baseMinusT)) {
error('overflow')
}
w *= baseMinusT
}
out = output.length + 1
bias = adapt(i - oldi, out, oldi == 0)
// `i` was supposed to wrap around from `out` to `0`,
// incrementing `n` each time, so we'll fix that now:
if (floor(i / out) > maxInt - n) {
error('overflow')
}
n += floor(i / out)
i %= out
// Insert `n` at position `i` of the output
output.splice(i++, 0, n)
}
return ucs2encode(output)
}
/**
* Converts a string of Unicode symbols (e.g. a domain name label) to a
* Punycode string of ASCII-only symbols.
* @memberOf punycode
* @param {String} input The string of Unicode symbols.
* @returns {String} The resulting Punycode string of ASCII-only symbols.
*/
function encode(input) {
var n,
delta,
handledCPCount,
basicLength,
bias,
j,
m,
q,
k,
t,
currentValue,
output = [],
/** `inputLength` will hold the number of code points in `input`. */
inputLength,
/** Cached calculation results */
handledCPCountPlusOne,
baseMinusT,
qMinusT
// Convert the input in UCS-2 to Unicode
input = ucs2decode(input)
// Cache the length
inputLength = input.length
// Initialize the state
n = initialN
delta = 0
bias = initialBias
// Handle the basic code points
for (j = 0; j < inputLength; ++j) {
currentValue = input[j]
if (currentValue < 0x80) {
output.push(stringFromCharCode(currentValue))
}
}
handledCPCount = basicLength = output.length
// `handledCPCount` is the number of code points that have been handled;
// `basicLength` is the number of basic code points.
// Finish the basic string - if it is not empty - with a delimiter
if (basicLength) {
output.push(delimiter)
}
// Main encoding loop:
while (handledCPCount < inputLength) {
// All non-basic code points < n have been handled already. Find the next
// larger one:
for (m = maxInt, j = 0; j < inputLength; ++j) {
currentValue = input[j]
if (currentValue >= n && currentValue < m) {
m = currentValue
}
}
// Increase `delta` enough to advance the decoder's <n,i> state to <m,0>,
// but guard against overflow
handledCPCountPlusOne = handledCPCount + 1
if (m - n > floor((maxInt - delta) / handledCPCountPlusOne)) {
error('overflow')
}
delta += (m - n) * handledCPCountPlusOne
n = m
for (j = 0; j < inputLength; ++j) {
currentValue = input[j]
if (currentValue < n && ++delta > maxInt) {
error('overflow')
}
if (currentValue == n) {
// Represent delta as a generalized variable-length integer
for (q = delta, k = base /* no condition */; ; k += base) {
t = k <= bias ? tMin : k >= bias + tMax ? tMax : k - bias
if (q < t) {
break
}
qMinusT = q - t
baseMinusT = base - t
output.push(stringFromCharCode(digitToBasic(t + (qMinusT % baseMinusT), 0)))
q = floor(qMinusT / baseMinusT)
}
output.push(stringFromCharCode(digitToBasic(q, 0)))
bias = adapt(delta, handledCPCountPlusOne, handledCPCount == basicLength)
delta = 0
++handledCPCount
}
}
++delta
++n
}
return output.join('')
}
/**
* Converts a Punycode string representing a domain name or an email address
* to Unicode. Only the Punycoded parts of the input will be converted, i.e.
* it doesn't matter if you call it on a string that has already been
* converted to Unicode.
* @memberOf punycode
* @param {String} input The Punycoded domain name or email address to
* convert to Unicode.
* @returns {String} The Unicode representation of the given Punycode
* string.
*/
function toUnicode(input) {
return mapDomain(input, function(string) {
return regexPunycode.test(string) ? decode(string.slice(4).toLowerCase()) : string
})
}
/**
* Converts a Unicode string representing a domain name or an email address to
* Punycode. Only the non-ASCII parts of the domain name will be converted,
* i.e. it doesn't matter if you call it with a domain that's already in
* ASCII.
* @memberOf punycode
* @param {String} input The domain name or email address to convert, as a
* Unicode string.
* @returns {String} The Punycode representation of the given domain name or
* email address.
*/
function toASCII(input) {
return mapDomain(input, function(string) {
return regexNonASCII.test(string) ? 'xn--' + encode(string) : string
})
}
/*--------------------------------------------------------------------------*/
/** Define the public API */
punycode = {
/**
* A string representing the current Punycode.js version number.
* @memberOf punycode
* @type String
*/
version: '1.4.1',
/**
* An object of methods to convert from JavaScript's internal character
* representation (UCS-2) to Unicode code points, and back.
* @see <https://mathiasbynens.be/notes/javascript-encoding>
* @memberOf punycode
* @type Object
*/
ucs2: {
decode: ucs2decode,
encode: ucs2encode
},
decode: decode,
encode: encode,
toASCII: toASCII,
toUnicode: toUnicode
}
/** Expose `punycode` */
// Some AMD build optimizers, like r.js, check for specific condition patterns
// like the following:
if (typeof define == 'function' && typeof define.amd == 'object' && define.amd) {
define('punycode', function() {
return punycode
})
} else if (freeExports && freeModule) {
if (module.exports == freeExports) {
// in Node.js, io.js, or RingoJS v0.8.0+
freeModule.exports = punycode
} else {
// in Narwhal or RingoJS v0.7.0-
for (key in punycode) {
punycode.hasOwnProperty(key) && (freeExports[key] = punycode[key])
}
}
} else {
// in Rhino or a web browser
root.punycode = punycode
}
})(this)

File diff suppressed because one or more lines are too long

View File

@@ -1,316 +1,346 @@
//BBCodeとMarkdownの入力・パーサー
//アカウント変えた時にBBとかMDとか
function mdCheck() {
var acct_id = $("#post-acct-sel").val();
var profimg = localStorage.getItem("prof_" + acct_id);
var acct_id = $('#post-acct-sel').val()
var profimg = localStorage.getItem('prof_' + acct_id)
if (!profimg) {
profimg = "../../img/missing.svg";
profimg = '../../img/missing.svg'
}
$("#acct-sel-prof").attr("src", profimg);
if (localStorage.getItem("post_" + acct_id)) {
$("#toot-post-btn").text(localStorage.getItem("post_" + acct_id) + "(" + localStorage.getItem("domain_" + acct_id) + ")");
$('#acct-sel-prof').attr('src', profimg)
if (localStorage.getItem('post_' + acct_id)) {
$('#toot-post-btn').text(
localStorage.getItem('post_' + acct_id) +
'(' +
localStorage.getItem('domain_' + acct_id) +
')'
)
} else {
$("#toot-post-btn").text(lang.lang_toot + "(" + localStorage.getItem("domain_" + acct_id) + ")");
$('#toot-post-btn').text(lang.lang_toot + '(' + localStorage.getItem('domain_' + acct_id) + ')')
}
if (!localStorage.getItem("bb_" + acct_id) && !localStorage.getItem("md_" + acct_id)) {
$(".markdown").addClass("hide");
$(".anti-markdown").addClass("hide");
if (!localStorage.getItem('bb_' + acct_id) && !localStorage.getItem('md_' + acct_id)) {
$('.markdown').addClass('hide')
$('.anti-markdown').addClass('hide')
} else {
$(".anti-markdown").removeClass("hide");
$('.anti-markdown').removeClass('hide')
}
if ($(".markdown").hasClass("hide")) {
localStorage.setItem("md", "hide");
if ($('.markdown').hasClass('hide')) {
localStorage.setItem('md', 'hide')
} else {
localStorage.removeItem("md");
localStorage.removeItem('md')
}
var domain = localStorage.getItem("domain_" + acct_id);
if (domain == "itabashi.0j0.jp") {
$("#limited-button").removeClass("hide");
var domain = localStorage.getItem('domain_' + acct_id)
if (domain == 'itabashi.0j0.jp') {
$('#limited-button').removeClass('hide')
} else {
$("#limited-button").addClass("hide");
$('#limited-button').addClass('hide')
}
if (domain == "kirishima.cloud") {
$("#faicon-btn").show();
if (domain == 'kirishima.cloud') {
$('#faicon-btn').show()
} else {
$("#faicon-btn").hide();
$('#faicon-btn').hide()
}
if (domain == "imastodon.net") {
trendTag();
if (domain == 'imastodon.net') {
trendTag()
} else {
$("#trendtag").html("");
$('#trendtag').html('')
}
if (localStorage.getItem("mode_" + domain) == "misskey") {
if (localStorage.getItem('mode_' + domain) == 'misskey') {
M.toast({ html: lang.lang_bbmd_misskey, displayLength: 5000 })
}
if (idata[domain + "_letters"]) {
$("#textarea").attr("data-length", idata[domain + "_letters"])
if (idata[domain + '_letters']) {
$('#textarea').attr('data-length', idata[domain + '_letters'])
} else {
$("#textarea").attr("data-length", 500)
}
if (idata[domain + "_glitch"] === "true") {
$("#local-button").removeClass("hide");
} else {
$("#local-button").addClass("hide");
}
var multi = localStorage.getItem("multi");
if (multi) {
var obj = JSON.parse(multi);
if (obj[acct_id].background && obj[acct_id].background != "def" && obj[acct_id].text && obj[acct_id].text != "def") {
$("#toot-post-btn").removeClass("indigo");
$("#toot-post-btn").css("background-color", "#" + obj[acct_id].background);
$("#toot-post-btn").css("color", obj[acct_id].text);
var maxletters = localStorage.getItem('letters_' + acct_id)
if (maxletters > 0) {
$('#textarea').attr('data-length', maxletters)
} else {
$("#toot-post-btn").css("background-color", "");
$("#toot-post-btn").css("color", "");
$("#toot-post-btn").addClass("indigo");
$('#textarea').attr('data-length', 500)
}
}
loadVis();
if (idata[domain + '_glitch'] === 'true') {
$('#local-button').removeClass('hide')
} else {
$('#local-button').addClass('hide')
}
var multi = localStorage.getItem('multi')
if (multi) {
var obj = JSON.parse(multi)
if (
obj[acct_id].background &&
obj[acct_id].background != 'def' &&
obj[acct_id].text &&
obj[acct_id].text != 'def'
) {
$('#toot-post-btn').removeClass('indigo')
$('#toot-post-btn').css('background-color', '#' + obj[acct_id].background)
$('#toot-post-btn').css('color', obj[acct_id].text)
} else {
$('#toot-post-btn').css('background-color', '')
$('#toot-post-btn').css('color', '')
$('#toot-post-btn').addClass('indigo')
}
}
loadVis()
}
//BOXのトグルボタン
function mdToggle() {
$(".markdown").toggleClass("hide");
$(".anti-markdown").toggleClass("hide");
if ($(".markdown").hasClass("hide")) {
localStorage.setItem("md", "hide");
$('.markdown').toggleClass('hide')
$('.anti-markdown').toggleClass('hide')
if ($('.markdown').hasClass('hide')) {
localStorage.setItem('md', 'hide')
} else {
localStorage.removeItem("md");
localStorage.removeItem('md')
}
}
//最初に読み込みます(MD対応インスタンスかチェック)
if (localStorage.getItem("md") == "hide") {
$(".markdown").addClass("hide");
$(".anti-markdown").removeClass("hide");
if (localStorage.getItem('md') == 'hide') {
$('.markdown').addClass('hide')
$('.anti-markdown').removeClass('hide')
}
//タグを選んだ時に(BB版)
function tagsel(tag) {
var acct_id = $("#post-acct-sel").val();
if (!localStorage.getItem("bb_" + acct_id)) {
return false;
var acct_id = $('#post-acct-sel').val()
if (!localStorage.getItem('bb_' + acct_id)) {
return false
}
if (tag == "large" || tag == "size" || tag == "color" || tag == "colorhex") {
var sub = $("#" + tag).val();
var sub = sub.replace(/#/g, "");
surroundHTML(tag + "=" + sub, tag);
} else if (tag == "flip=vertical" || tag == "flip=horizontal") {
surroundHTML(tag, "flip");
if (tag == 'large' || tag == 'size' || tag == 'color' || tag == 'colorhex') {
var sub = $('#' + tag).val()
var sub = sub.replace(/#/g, '')
surroundHTML(tag + '=' + sub, tag)
} else if (tag == 'flip=vertical' || tag == 'flip=horizontal') {
surroundHTML(tag, 'flip')
} else {
surroundHTML(tag, tag);
surroundHTML(tag, tag)
}
$("#textarea").focus();
$('#textarea').focus()
}
//HTMLをエスケープしてXSSを防ぐ
function escape_html(string) {
if (typeof string !== 'string') {
return string;
return string
}
return string.replace(/[&'`"<>]/g, function (match) {
return string.replace(/[&'`"<>]/g, function(match) {
return {
'&': '&amp;',
"'": '&#x27;',
'`': '&#x60;',
'"': '&quot;',
'<': '&lt;',
'>': '&gt;',
'>': '&gt;'
}[match]
});
})
}
//テキストボックスで選択したやつをタグで囲む(BB版)
function surroundHTML(tagS, tagE) {
var acct_id = $("#post-acct-sel").val();
if (!localStorage.getItem("bb_" + acct_id)) {
return false;
var acct_id = $('#post-acct-sel').val()
if (!localStorage.getItem('bb_' + acct_id)) {
return false
}
var target = document.getElementById("textarea");
var pos = getAreaRange(target);
var target = document.getElementById('textarea')
var pos = getAreaRange(target)
var val = target.value;
var range = val.slice(pos.start, pos.end);
var beforeNode = val.slice(0, pos.start);
var afterNode = val.slice(pos.end);
var insertNode;
var val = target.value
var range = val.slice(pos.start, pos.end)
var beforeNode = val.slice(0, pos.start)
var afterNode = val.slice(pos.end)
var insertNode
if (range || pos.start != pos.end) {
insertNode = '[' + tagS + ']' + range + '[/' + tagE + ']';
target.value = beforeNode + insertNode + afterNode;
}
else if (pos.start == pos.end) {
insertNode = '[' + tagS + ']' + '[/' + tagE + ']';
target.value = beforeNode + insertNode + afterNode;
insertNode = '[' + tagS + ']' + range + '[/' + tagE + ']'
target.value = beforeNode + insertNode + afterNode
} else if (pos.start == pos.end) {
insertNode = '[' + tagS + ']' + '[/' + tagE + ']'
target.value = beforeNode + insertNode + afterNode
}
}
function markdown(tag, ck, br, space) {
if (space == "before") {
tagE = tag;
tag = " " + tag;
if (space == 'before') {
tagE = tag
tag = ' ' + tag
} else {
tagE = tag;
tagE = tag
}
surroundMD(tag, tagE, ck, br);
$("#textarea").focus();
surroundMD(tag, tagE, ck, br)
$('#textarea').focus()
}
function surroundMD(tagS, tagE, ck, br) {
var acct_id = $("#post-acct-sel").val();
if (!localStorage.getItem("md_" + acct_id)) {
return false;
var acct_id = $('#post-acct-sel').val()
if (!localStorage.getItem('md_' + acct_id)) {
return false
}
var target = document.getElementById("textarea");
var pos = getAreaRange(target);
var target = document.getElementById('textarea')
var pos = getAreaRange(target)
var val = target.value;
var range = val.slice(pos.start, pos.end);
var beforeNode = val.slice(0, pos.start);
var afterNode = val.slice(pos.end);
var insertNode;
if (br == "yes") {
var br = "\n";
var val = target.value
var range = val.slice(pos.start, pos.end)
var beforeNode = val.slice(0, pos.start)
var afterNode = val.slice(pos.end)
var insertNode
if (br == 'yes') {
var br = '\n'
} else {
var br = "";
var br = ''
}
if ((range || pos.start != pos.end) && ck == "yes") {
insertNode = tagS + range + tagE;
target.value = beforeNode + insertNode + br + afterNode;
}
else if (pos.start == pos.end || ck == "no") {
insertNode = tagS + range;
target.value = beforeNode + insertNode + br + afterNode;
if ((range || pos.start != pos.end) && ck == 'yes') {
insertNode = tagS + range + tagE
target.value = beforeNode + insertNode + br + afterNode
} else if (pos.start == pos.end || ck == 'no') {
insertNode = tagS + range
target.value = beforeNode + insertNode + br + afterNode
}
}
//テキストボックスの前後チェック
function getAreaRange(obj) {
var pos = new Object();
var pos = new Object()
if (window.getSelection()) {
pos.start = obj.selectionStart;
pos.end = obj.selectionEnd;
pos.start = obj.selectionStart
pos.end = obj.selectionEnd
}
return pos;
return pos
}
//Markdownのリンク挿入
function markdownLink() {
var acct_id = $("#post-acct-sel").val();
if (!localStorage.getItem("md_" + acct_id)) {
return false;
var acct_id = $('#post-acct-sel').val()
if (!localStorage.getItem('md_' + acct_id)) {
return false
}
var linkIns = "[" + $("#linkt").val() + "]" + "(" + $("#link2").val() + ")";
if (linkIns != "[]()") {
$("#textarea").val($("#textarea").val() + linkIns);
$("#linkt").val("");
$("#link2").val("");
$("#textarea").focus();
var linkIns = '[' + $('#linkt').val() + ']' + '(' + $('#link2').val() + ')'
if (linkIns != '[]()') {
$('#textarea').val($('#textarea').val() + linkIns)
$('#linkt').val('')
$('#link2').val('')
$('#textarea').focus()
}
}
//Markdownのimg挿入
function markdownImage() {
var acct_id = $("#post-acct-sel").val();
if (!localStorage.getItem("md_" + acct_id)) {
return false;
var acct_id = $('#post-acct-sel').val()
if (!localStorage.getItem('md_' + acct_id)) {
return false
}
var imgIns = "![" + $("#image").val() + "]" + "(" + $("#image2").val() + ")";
if (imgIns != "![]()") {
$("#textarea").val($("#textarea").val() + imgIns);
$("#image").val("");
$("#image2").val("");
$("#textarea").focus();
var imgIns = '![' + $('#image').val() + ']' + '(' + $('#image2').val() + ')'
if (imgIns != '![]()') {
$('#textarea').val($('#textarea').val() + imgIns)
$('#image').val('')
$('#image2').val('')
$('#textarea').focus()
}
}
//文字数をチェック(hタグ用)
function str_count(all, part) {
return (all.match(new RegExp(part, "g")) || []).length;
return (all.match(new RegExp(part, 'g')) || []).length
}
//プレビュー
function preview() {
$("#preview-field").show();
$("#toot-field").hide();
$("#preview-btn").hide();
var bb = escape_html($("#textarea").val());
$('#preview-field').show()
$('#toot-field').hide()
$('#preview-btn').hide()
var bb = escape_html($('#textarea').val())
//quote
var bb = bb.replace(/>(.+)$/g, '<blockquote>$1<\/blockquote>');
var bb = bb.replace(/>(.+)$/g, '<blockquote>$1</blockquote>')
//spin
var bb = bb.replace(/\[spin\](.+)\[\/spin\]/g, '<span class="fa fa-spin">$1<\/span>');
var bb = bb.replace(/\[spin\](.+)\[\/spin\]/g, '<span class="fa fa-spin">$1</span>')
//pulse
var bb = bb.replace(/\[pulse\](.+)\[\/pulse\]/g, '<span class="bbcode-pulse-loading">$1<\/span>');
var bb = bb.replace(/\[pulse\](.+)\[\/pulse\]/g, '<span class="bbcode-pulse-loading">$1</span>')
//large
var bb = bb.replace(/\[large=([0-9]{1,2})x\](.+)\[\/large\]/g, '<span class="fa fa-$1x">$2<\/span>');
var bb = bb.replace(
/\[large=([0-9]{1,2})x\](.+)\[\/large\]/g,
'<span class="fa fa-$1x">$2</span>'
)
//vertical
var bb = bb.replace(/\[flip=vertical\](.+)\[\/flip\]/g, '<span class="fa fa-flip-vertical">$1<\/span>');
var bb = bb.replace(
/\[flip=vertical\](.+)\[\/flip\]/g,
'<span class="fa fa-flip-vertical">$1</span>'
)
//horizontal
var bb = bb.replace(/\[flip=horizontal\](.+)\[\/flip\]/g, '<span class="fa fa-flip-horizontal">$1<\/span>');
var bb = bb.replace(
/\[flip=horizontal\](.+)\[\/flip\]/g,
'<span class="fa fa-flip-horizontal">$1</span>'
)
//b
var bb = bb.replace(/\[b\](.+)\[\/b\]/g, '<b>$1<\/b>');
var bb = bb.replace(/\[b\](.+)\[\/b\]/g, '<b>$1</b>')
//i
var bb = bb.replace(/\[i\](.+)\[\/i\]/g, '<i>$1<\/i>');
var bb = bb.replace(/\[i\](.+)\[\/i\]/g, '<i>$1</i>')
//u
var bb = bb.replace(/\[u\](.+)\[\/u\]/g, '<u>$1<\/u>');
var bb = bb.replace(/\[u\](.+)\[\/u\]/g, '<u>$1</u>')
//s
var bb = bb.replace(/\[s\](.+)\[\/s\]/g, '<s>$1<\/s>');
var bb = bb.replace(/\[s\](.+)\[\/s\]/g, '<s>$1</s>')
//size
var bb = bb.replace(/\[size=([0-9]{1,2})\](.+)\[\/size\]/g, '<span style="font-size:$1px">$2<\/span>');
var bb = bb.replace(
/\[size=([0-9]{1,2})\](.+)\[\/size\]/g,
'<span style="font-size:$1px">$2</span>'
)
//colorhex
var bb = bb.replace(/\[colorhex=([A-Fa-f0-9]+)\](.+)\[\/colorhex\]/g, '<span style="color:#$1">$2<\/span>');
var bb = bb.replace(
/\[colorhex=([A-Fa-f0-9]+)\](.+)\[\/colorhex\]/g,
'<span style="color:#$1">$2</span>'
)
//code
var bb = bb.replace(/`(.+)`/g, '<code>$1<\/code>');
var bb = bb.replace(/`(.+)`/g, '<code>$1</code>')
//head
var m;
m = bb.match(/^#{1,6}(.+)$/gm);
var m
m = bb.match(/^#{1,6}(.+)$/gm)
if (m) {
for (let i = 0; i < m.length; i++) {
var t = m[i].match(/^#{1,6}(.+)$/);
var indexct = '<h' + str_count(m[i], "#") + '>' + t[1] + '</h' + str_count(m[i], "#") + '>';
var bb = bb.replace(new RegExp(m[i], ""), indexct);
var t = m[i].match(/^#{1,6}(.+)$/)
var indexct = '<h' + str_count(m[i], '#') + '>' + t[1] + '</h' + str_count(m[i], '#') + '>'
var bb = bb.replace(new RegExp(m[i], ''), indexct)
}
}
//list(ul)
var li;
li = bb.match(/^\- (.+)$/gm);
var li
li = bb.match(/^\- (.+)$/gm)
if (li) {
for (let l = 0; l < li.length; l++) {
var u = li[l].match(/^\- (.+)$/);
var listUl = '<li>' + u[1] + '</li>';
var u = li[l].match(/^\- (.+)$/)
var listUl = '<li>' + u[1] + '</li>'
if (l == 0) {
listUl = '<ul>' + listUl;
listUl = '<ul>' + listUl
}
if (l == li.length - 1) {
listUl = listUl + '</ul>';
listUl = listUl + '</ul>'
}
var bb = bb.replace(new RegExp(li[l], ""), listUl);
var bb = bb.replace(new RegExp(li[l], ''), listUl)
}
}
//list(ol)
var li;
li = bb.match(/^1\. (.+)$/gm);
var li
li = bb.match(/^1\. (.+)$/gm)
if (li) {
for (let l = 0; l < li.length; l++) {
var u = li[l].match(/^1\. (.+)$/);
var listUl = '<li>' + u[1] + '</li>';
var u = li[l].match(/^1\. (.+)$/)
var listUl = '<li>' + u[1] + '</li>'
if (l === 0) {
listUl = '<ol>' + listUl;
listUl = '<ol>' + listUl
}
if (l === li.length - 1) {
listUl = listUl + '</ol>';
listUl = listUl + '</ol>'
}
var bb = bb.replace(new RegExp(li[l], ""), listUl);
var bb = bb.replace(new RegExp(li[l], ''), listUl)
}
}
//img
var bb = bb.replace(/!\[(.+)\]\((https:\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)\)/g, '<img src="$2" text="$1" style="width:100%">');
var bb = bb.replace(
/!\[(.+)\]\((https:\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)\)/g,
'<img src="$2" text="$1" style="width:100%">'
)
//link
var bb = bb.replace(/\[(.+)\]\((https?:\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)\)/g, '<a href="$2" target="_blank">$1<\/a>');
bb = nl2br(bb);
bb = bb.replace(new RegExp("</li><br />", "g"), "");
$("#md-preview").html(bb);
var bb = bb.replace(
/\[(.+)\]\((https?:\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)\)/g,
'<a href="$2" target="_blank">$1</a>'
)
bb = nl2br(bb)
bb = bb.replace(new RegExp('</li><br />', 'g'), '')
$('#md-preview').html(bb)
}
//Editで戻る
function previewEdit() {
$("#preview-field").hide();
$("#toot-field").show();
$("#preview-btn").show();
$("#md-preview").html("");
}
$('#preview-field').hide()
$('#toot-field').show()
$('#preview-btn').show()
$('#md-preview').html('')
}

View File

@@ -1,215 +1,330 @@
//絵文字ピッカー
//最初に読み込む
$("#emoji-before").addClass("disabled");
$("#emoji-next").addClass("disabled");
$('#emoji-before').addClass('disabled')
$('#emoji-next').addClass('disabled')
//絵文字ボタンのトグル
function emojiToggle(reaction) {
var acct_id = $("#post-acct-sel").val();
var selin = $("#textarea").prop('selectionStart');
var acct_id = $('#post-acct-sel').val()
var selin = $('#textarea').prop('selectionStart')
if (!selin) {
selin = 0;
selin = 0
}
localStorage.setItem("cursor", selin);
if ($("#emoji").hasClass("hide")) {
$("#emoji").removeClass("hide")
$("#right-side").show()
$("#suggest").html("");
if (!localStorage.getItem("emoji_" + acct_id)) {
var html =
'<button class="btn waves-effect green" style="width:100%; padding:0; margin-top:0;" onclick="emojiGet(\'true\');">' + lang.lang_emoji_get + '</button>';
$("#emoji-list").html(html);
if ($('#emoji').hasClass('hide')) {
$('#emoji').removeClass('hide')
$('#right-side').show()
$('#right-side').css('width', '300px')
$('#left-side').css('width', 'calc(100% - 300px)')
var width = localStorage.getItem('postbox-width')
if (width) {
width = width.replace('px', '') * 1 + 300
} else {
emojiList('home', reaction);
width = 600
}
$('#post-box').css('width', width + 'px')
$('#suggest').html('')
if (!localStorage.getItem('emojis_' + acct_id)) {
var html = `<button class="btn waves-effect green" style="width:100%; padding:0; margin-top:0;" onclick="emojiGet('true');">${lang.lang_emoji_get}</button>`
$('#emoji-list').html(html)
} else {
emojiList('home', reaction)
}
} else {
$("#poll").addClass("hide")
$("#emoji").addClass("hide")
$("#suggest").html("");
$("#right-side").hide()
$('#poll').addClass('hide')
$('#right-side').hide()
$('#right-side').css('width', '300px')
$('#emoji').addClass('hide')
$('#suggest').html('')
$('#left-side').css('width', '100%')
var width = localStorage.getItem('postbox-width')
if (width) {
width = width.replace('px', '') * 1
} else {
width = 300
}
$('#post-box').css('width', width + 'px')
}
}
//絵文字リスト挿入
function emojiGet(parse, started) {
$('#emoji-list').text('Loading...');
var acct_id = $("#post-acct-sel").val();
var domain = localStorage.getItem("domain_" + acct_id);
if (localStorage.getItem("mode_" + domain) != "misskey") {
var start = "https://" + domain + "/api/v1/custom_emojis";
$('#emoji-list').text('Loading...')
var acct_id = $('#post-acct-sel').val()
var domain = localStorage.getItem('domain_' + acct_id)
if (localStorage.getItem('mode_' + domain) != 'misskey') {
var start = 'https://' + domain + '/api/v1/custom_emojis'
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json'
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
if (parse == "true") {
$('#emoji-list').text('Parsing...');
//絵文字をマストドン公式と同順にソート
json.sort(function (a, b) {
if (a.shortcode < b.shortcode) return -1;
if (a.shortcode > b.shortcode) return 1;
return 0;
});
localStorage.setItem("emoji_" + acct_id, JSON.stringify(json));
} else {
localStorage.setItem("emoji_" + acct_id, JSON.stringify(json));
}
localStorage.setItem("emojiseek", 0);
if (!started) {
emojiList('home')
}
});
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
if (parse == 'true') {
$('#emoji-list').text('Parsing...')
var md = {
categorized: {},
uncategorized: []
}
var if_categorized = false
Object.keys(json).forEach(function(key) {
var emoji = json[key]
if (emoji.visible_in_picker) {
var listed = true
} else {
var listed = false
}
if (emoji.category) {
var cat = emoji.category
if (!md['categorized'][cat]) {
md['categorized'][cat] = []
}
md['categorized'][cat].push({
shortcode: emoji.shortcode,
url: emoji.url,
listed: listed
})
if_categorized = true
} else {
md['uncategorized'].push({
shortcode: emoji.shortcode,
url: emoji.url,
listed: listed
})
}
})
console.log(md)
//絵文字をマストドン公式と同順にソート
md['uncategorized'].sort(function(a, b) {
if (a.shortcode < b.shortcode) return -1
if (a.shortcode > b.shortcode) return 1
return 0
})
Object.keys(md['categorized']).forEach(function(key) {
md['categorized'][key].sort(function(a, b) {
if (a.shortcode < b.shortcode) return -1
if (a.shortcode > b.shortcode) return 1
return 0
})
})
md['if_categorized'] = if_categorized
localStorage.setItem('emojis_' + acct_id, JSON.stringify(md))
} else {
localStorage.setItem('emojis_' + acct_id, JSON.stringify(md))
}
localStorage.setItem('emojiseek', 0)
if (!started) {
emojiList('home')
}
})
} else {
var start = "https://" + domain + "/api/meta";
var start = 'https://' + domain + '/api/meta'
fetch(start, {
method: 'POST',
headers: {
'content-type': 'application/json'
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
if (json.enableEmojiReaction) {
localStorage.setItem("emojiReaction_" + acct_id, "true");
} else {
localStorage.setItem("emojiReaction_" + acct_id, "disabled");
}
var emojis = json.emojis;
var md = [];
Object.keys(emojis).forEach(function (key) {
var emoji = emojis[key];
md.push({
"shortcode": emoji.name,
"url": emoji.url
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
if (json.enableEmojiReaction) {
localStorage.setItem('emojiReaction_' + acct_id, 'true')
} else {
localStorage.setItem('emojiReaction_' + acct_id, 'disabled')
}
var emojis = json.emojis
var md = { uncategorized: [] }
Object.keys(emojis).forEach(function(key) {
var emoji = emojis[key]
md['uncategorized'].push({
shortcode: emoji.name,
url: emoji.url,
listed: true
})
})
});
if (parse == "true") {
$('#emoji-list').text('Parsing...');
//絵文字をマストドン公式と同順にソート
md.sort(function (a, b) {
if (a.shortcode < b.shortcode) return -1;
if (a.shortcode > b.shortcode) return 1;
return 0;
});
localStorage.setItem("emoji_" + acct_id, JSON.stringify(md));
} else {
localStorage.setItem("emoji_" + acct_id, JSON.stringify(md));
}
localStorage.setItem("emojiseek", 0);
if (!started) {
emojiList('home')
}
});
md['if_categorized'] = false
if (parse == 'true') {
$('#emoji-list').text('Parsing...')
//絵文字をマストドン公式と同順にソート
md['uncategorized'].sort(function(a, b) {
if (a.shortcode < b.shortcode) return -1
if (a.shortcode > b.shortcode) return 1
return 0
})
localStorage.setItem('emojis_' + acct_id, JSON.stringify(md))
} else {
localStorage.setItem('emojis_' + acct_id, JSON.stringify(md))
}
localStorage.setItem('emojiseek', 0)
if (!started) {
emojiList('home')
}
})
}
}
//リストの描画
function emojiList(target, reaction) {
$("#now-emoji").text(lang.lang_emoji_custom);
var acct_id = $("#post-acct-sel").val();
if (reaction && localStorage.getItem("emojiReaction_" + acct_id) != "true") {
console.error("Disabled")
$('#now-emoji').text(lang.lang_emoji_custom)
var acct_id = $('#post-acct-sel').val()
if (reaction && localStorage.getItem('emojiReaction_' + acct_id) != 'true') {
console.error('Disabled')
clear()
hide();
return false;
hide()
return false
}
var start = localStorage.getItem("emojiseek");
if (target == "next") {
var start = start * 1 + 127;
localStorage.setItem("emojiseek", start);
} else if (target == "before") {
var start = start - 127;
localStorage.setItem("emojiseek", start);
var start = localStorage.getItem('emojiseek')
if (target == 'next') {
var start = start * 1 + 127
localStorage.setItem('emojiseek', start)
} else if (target == 'before') {
var start = start - 127
localStorage.setItem('emojiseek', start)
} else {
var start = 0;
localStorage.getItem("emojiseek", 0)
var start = 0
localStorage.getItem('emojiseek', 0)
}
var html = '';
var obj = JSON.parse(localStorage.getItem("emoji_" + acct_id));
var num = obj.length;
var html = ''
var raw = JSON.parse(localStorage.getItem('emojis_' + acct_id))
console.log(raw)
if (raw.if_categorized) {
var obj = [
{
divider: true,
cat: lang.lang_emoji_uncat
}
]
var cats = raw['uncategorized']
obj = obj.concat(cats)
Object.keys(raw['categorized']).forEach(function(key) {
var cats = raw['categorized'][key]
obj = obj.concat([
{
divider: true,
cat: key
}
])
obj = obj.concat(cats)
})
} else {
var obj = raw['uncategorized']
}
console.log(obj)
var num = obj.length
if (num < start) {
var start = 0;
localStorage.setItem("emojiseek", start);
var start = 0
localStorage.setItem('emojiseek', start)
}
var page = Math.ceil(num / 126);
$("#emoji-sum").text(page);
var ct = Math.ceil(start / 126);
var page = Math.ceil(num / 126)
$('#emoji-sum').text(page)
var ct = Math.ceil(start / 126)
if (ct === 0) {
var ct = 1;
$("#emoji-before").addClass("disabled");
if (num > 0) {
var ct = 1
}
$('#emoji-before').addClass('disabled')
} else {
$("#emoji-before").removeClass("disabled");
$('#emoji-before').removeClass('disabled')
}
$("#emoji-next").removeClass("disabled");
$("#emoji-count").text(ct);
if (page != 1) {
$('#emoji-next').removeClass('disabled')
} else {
$('#emoji-next').addClass('disabled')
}
$('#emoji-count').text(ct)
for (i = start; i < start + 126; i++) {
var emoji = obj[i];
var emoji = obj[i]
if (emoji) {
if (reaction) {
html = html + '<a onclick="emojiReaction(\':' + emoji.shortcode +
':\')" class="pointer"><img src="' + emoji.url + '" width="20"></a>';
html =
html +
`<a onclick="emojiReaction(':${emoji.shortcode}:')" class="pointer"><img src="${emoji.url}" width="20" title="${emoji.shortcode}"></a>`
} else {
html = html + '<a onclick="emojiInsert(\':' + emoji.shortcode +
':\')" class="pointer"><img src="' + emoji.url + '" width="20"></a>';
if (emoji.divider) {
html = html + '<p style="margin-bottom:0">' + emoji.cat + '</p>'
} else {
if (emoji.listed) {
html =
html +
`<a onclick="emojiInsert(':${emoji.shortcode}:')" class="pointer"><img src="${emoji.url}" width="20" title="${emoji.shortcode}"></a>`
}
}
}
}
}
$("#emoji-list").html(html);
$('#emoji-list').html(html)
}
//絵文字など様々なものをテキストボックスに挿入
function emojiInsert(code, del) {
var now = $("#textarea").val();
var selin = localStorage.getItem("cursor");
if (localStorage.getItem("emoji-zero-width") == "yes") {
var brank = "";
if (localStorage.getItem('emoji-zero-width') == 'yes') {
var blankBefore = ''
var blankAfter = ''
} else {
var brank = " ";
var blankBefore = ' '
var blankAfter = ' '
}
var now = $("#textarea").val();
if (selin > 0) {
var before = now.substr(0, selin);
var after = now.substr(selin, now.length);
newt = before + brank + code + brank + after;
var textarea = document.querySelector('#textarea')
var sentence = textarea.value
var len = sentence.length
var pos = textarea.selectionStart
if (del) {
var delLen = del.length
} else {
newt = code + brank;
var delLen = 0
}
if (!del) {
$("#textarea").val(newt);
//emoji();
var before = sentence.substr(0, pos - delLen)
var last = before.substr(-1, 1)
if (last == ' ') blankBefore = ''
var after = sentence.substr(pos, len)
var start = after.substr(0, 1)
if (start == ' ') blankAfter = ''
if (len == 0) {
var word = code
} else if (len == pos) {
var word = blankBefore + code
} else if (pos == 0) {
var word = code + blankAfter
} else {
var regExp = new RegExp(del.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
var now = now.replace(regExp, "");
$("#textarea").val(now + brank + code);
var word = blankBefore + code + blankAfter
}
$("#textarea").focus();
var selin = $("#textarea").prop('selectionStart');
if (!selin) {
selin = 0;
}
localStorage.setItem("cursor", selin);
sentence = before + word + after
textarea.value = sentence
}
//改行挿入
function brInsert(code) {
if (!$('#post-box').hasClass("appear")) {
localStorage.setItem("nohide", true);
show();
if (!$('#post-box').hasClass('appear')) {
localStorage.setItem('nohide', true)
show()
}
var now = $("#textarea").val();
$("#textarea").val(now + code);
$("#textarea").focus();
var now = $('#textarea').val()
$('#textarea').val(now + code)
$('#textarea').focus()
}

View File

@@ -1,209 +1,252 @@
//ドラッグ・アンド・ドロップからアップロードまで。uiのimg.jsとは異なります。
var obj = $("body");
var system;
var obj = $('body')
var system
//ドラッグスタート
obj.on('dragstart', function (e) {
system = "locked"
});
obj.on('dragstart', function(e) {
system = 'locked'
})
//何もなくファイルが通過
obj.on('dragend', function (e) {
system = "";
});
obj.on('dragend', function(e) {
system = ''
})
//ドラッグファイルが画面上に
obj.on('dragenter', function (e) {
if (system != "locked") {
$("#drag").css('display', 'flex');
obj.on('dragenter', function(e) {
if (system != 'locked') {
$('#drag').css('display', 'flex')
}
});
$("body").on('dragover', function (e) {
e.stopPropagation();
e.preventDefault();
});
})
$('body').on('dragover', function(e) {
e.stopPropagation()
e.preventDefault()
})
//ドロップした
$("body").on('drop', function (e) {
if (system != "locked") {
$("#drag").css('display', 'none');
e.preventDefault();
var files = e.originalEvent.dataTransfer.files;
pimg(files);
$('body').on('drop', function(e) {
if (system != 'locked') {
$('#drag').css('display', 'none')
e.preventDefault()
var files = e.originalEvent.dataTransfer.files
pimg(files)
}
});
})
//何もなくファイルが通過
$("#drag").on('dragleave', function (e) {
$("#drag").css('display', 'none');
});
$('#drag').on('dragleave', function(e) {
$('#drag').css('display', 'none')
})
//複数アップ
function pimg(files) {
console.table(files);
console.table(files)
for (i = 0; i < files.length; i++) {
var dot = files[i].path.match(/\.(.+)$/)[1];
if (dot == "bmp" || dot == "BMP") {
postMessage(["bmpImage", [files[i].path, i]], "*")
todo(lang.lang_progress);
var dot = files[i].path.match(/\.(.+)$/)[1]
if (dot == 'bmp' || dot == 'BMP') {
postMessage(['bmpImage', [files[i].path, i]], '*')
todo(lang.lang_progress)
} else {
handleFileUpload(files[i], obj, i);
handleFileUpload(files[i], obj, i)
}
}
}
//ドラッグ・アンド・ドロップを終了
function closedrop() {
$("#drag").css('display', 'none');
$('#drag').css('display', 'none')
}
//ファイル選択
function fileselect() {
postMessage(["sendSinmpleIpc", "file-select"], "*")
postMessage(['sendSinmpleIpc', 'file-select'], '*')
}
//ファイル読み込み
function handleFileUpload(files, obj, no) {
var fr = new FileReader();
fr.onload = function (evt) {
var b64 = evt.target.result;
$('#b64-box').val(b64);
var ret = media(b64, files["type"], no)
var fr = new FileReader()
fr.onload = function(evt) {
var b64 = evt.target.result
var resize = localStorage.getItem('uploadCrop') * 1
if (resize > 0) {
var element = new Image()
var width
element.onload = function() {
var width = element.naturalWidth
var height = element.naturalHeight
if (width > resize || height > resize) {
postMessage(['resizeImage', [b64, resize]], '*')
return false
} else {
$('#b64-box').val(b64)
var ret = media(b64, files['type'], no)
}
}
element.src = b64
return false
}
$('#b64-box').val(b64)
var ret = media(b64, files['type'], no)
}
fr.readAsDataURL(files);
$("#mec").append(files["name"] + "/");
fr.readAsDataURL(files)
$('#mec').append(files['name'] + '/')
}
//ファイルアップロード
function media(b64, type, no) {
var l = 4;
var c = "abcdefghijklmnopqrstuvwxyz0123456789";
var cl = c.length;
var r = "";
function media(b64, type, no, stamped) {
var acct_id = $('#post-acct-sel').val()
var domain = localStorage.getItem('domain_' + acct_id)
var user = localStorage.getItem('user_' + acct_id)
if ($('#stamp').hasClass('stamp-avail') && !stamped) {
postMessage(['stampImage', [b64, user + '@' + domain]], '*')
return false
}
var l = 4
var c = 'abcdefghijklmnopqrstuvwxyz0123456789'
var cl = c.length
var r = ''
for (var i = 0; i < l; i++) {
r += c[Math.floor(Math.random() * cl)];
r += c[Math.floor(Math.random() * cl)]
}
if ($("#media").val()) {
$("#media").val($("#media").val() + ',' + "tmp_" + r);
if ($('#media').val()) {
$('#media').val($('#media').val() + ',' + 'tmp_' + r)
} else {
$("#media").val("tmp_" + r);
$('#media').val('tmp_' + r)
}
$(".toot-btn-group").prop("disabled", true);
$("#post-acct-sel").prop("disabled", true);
localStorage.setItem("image", "busy");
todo("Image Upload...");
var media = toBlob(b64, type);
var fd = new FormData();
fd.append('file', media);
var acct_id = $("#post-acct-sel").val();
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
var httpreq = new XMLHttpRequest();
if (localStorage.getItem("mode_" + domain) == "misskey") {
var start = "https://" + domain + "/api/drive/files/create";
httpreq.open('POST', start, true);
httpreq.upload.addEventListener("progress", progshow, false);
httpreq.responseType = "json";
if ($("#nsfw").hasClass("nsfw-avail")) {
var nsfw = true;
$('.toot-btn-group').prop('disabled', true)
$('#post-acct-sel').prop('disabled', true)
localStorage.setItem('image', 'busy')
todo('Image Upload...')
var media = toBlob(b64, type)
var fd = new FormData()
fd.append('file', media)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var httpreq = new XMLHttpRequest()
if (localStorage.getItem('mode_' + domain) == 'misskey') {
var start = 'https://' + domain + '/api/drive/files/create'
httpreq.open('POST', start, true)
httpreq.upload.addEventListener('progress', progshow, false)
httpreq.responseType = 'json'
if ($('#nsfw').hasClass('nsfw-avail')) {
var nsfw = true
} else {
var nsfw = false;
var nsfw = false
}
var previewer = "url"
fd.append('i', at);
//fd.append('isSensitive', nsfw);
httpreq.send(fd);
var previewer = 'url'
fd.append('i', at)
httpreq.send(fd)
} else {
var previewer = "preview_url"
var start = "https://" + domain + "/api/v1/media";
httpreq.open('POST', start, true);
httpreq.upload.addEventListener("progress", progshow, false);
httpreq.responseType = "json";
httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
httpreq.send(fd);
var previewer = 'preview_url'
var start = 'https://' + domain + '/api/v1/media'
httpreq.open('POST', start, true)
httpreq.upload.addEventListener('progress', progshow, false)
httpreq.responseType = 'json'
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.send(fd)
}
httpreq.onreadystatechange = function () {
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
var json = httpreq.response;
var img = localStorage.getItem("img");
if (json.type.indexOf("image") != -1) {
var html = '<img src="' + json[previewer] + '" class="preview-img pointer" data-media="' + json["id"] + '" onclick="deleteImage(\'' + json["id"] + '\')" title="' + lang.lang_postimg_delete + '">';
$('#preview').append(html);
var json = httpreq.response
if (this.status !== 200) {
setLog(start, this.status, json)
$('.toot-btn-group').prop('disabled', false)
$('select').formSelect()
$('#mec').text(lang.lang_there)
M.toast({ html: this.status + ':' +json, displayLength: 2000 })
$('#imgup').text('')
$('#imgsel').show()
}
if (!json.id) {
todc()
$('#imgup').text('')
$('.toot-btn-group').prop('disabled', false)
$('#post-acct-sel').prop('disabled', false)
$('select').formSelect()
$('#imgsel').show()
M.toast({ html: lang.lang_postimg_failupload, displayLength: 5000 })
return false
}
var img = localStorage.getItem('img')
if (json.type.indexOf('image') != -1) {
var html = `<img src="${json[previewer]}" class="preview-img pointer" data-media="${json['id']}" oncontextmenu="deleteImage('${json['id']}')" onclick="altImage('${acct_id}','${json['id']}')" title="${lang.lang_postimg_delete}">`
$('#preview').append(html)
} else {
$('#preview').append(lang.lang_postimg_previewdis);
$('#preview').append(lang.lang_postimg_previewdis)
}
if (!img) {
var img = "no-act";
var img = 'no-act'
}
if (img != "inline") {
var mediav = $("#media").val();
var regExp = new RegExp("tmp_" + r, "g");
mediav = mediav.replace(regExp, json["id"]);
$("#media").val(mediav);
if (img != 'inline') {
var mediav = $('#media').val()
var regExp = new RegExp('tmp_' + r, 'g')
mediav = mediav.replace(regExp, json['id'])
$('#media').val(mediav)
}
if (img == "url") {
$("#textarea").val($("#textarea").val() + " " + json["text_url"])
if (img == 'url' && json['text_url']) {
$('#textarea').val($('#textarea').val() + ' ' + json['text_url'])
}
todc();
$(".toot-btn-group").prop("disabled", false);
$('select').formSelect();
$("#mec").text(lang.lang_there);
todc()
if (localStorage.getItem('nsfw_' + acct_id)) {
$('#nsfw').addClass('yellow-text')
$('#nsfw').html('visibility')
$('#nsfw').addClass('nsfw-avail')
}
$('.toot-btn-group').prop('disabled', false)
$('select').formSelect()
$('#mec').text(lang.lang_there)
M.toast({ html: lang.lang_postimg_aftupload, displayLength: 1000 })
$("#imgup").text("");
$("#imgsel").show();
localStorage.removeItem("image");
$('#imgup').text('')
$('#imgsel').show()
localStorage.removeItem('image')
}
}
}
//Base64からBlobへ
function toBlob(base64, type) {
var bin = atob(base64.replace(/^.*,/, ''));
var buffer = new Uint8Array(bin.length);
var bin = atob(base64.replace(/^.*,/, ''))
var buffer = new Uint8Array(bin.length)
for (var i = 0; i < bin.length; i++) {
buffer[i] = bin.charCodeAt(i);
buffer[i] = bin.charCodeAt(i)
}
// Blobを作成
try {
var blob = new Blob([new Uint8Array(buffer)], {
type: type
});
})
} catch (e) {
return false;
return false
}
return blob;
return blob
}
//画像を貼り付けたら…
var element = document.querySelector("#textarea");
element.addEventListener("paste", function (e) {
var element = document.querySelector('#textarea')
element.addEventListener('paste', function(e) {
if (!e.clipboardData || !e.clipboardData.items) {
return true;
return true
}
// DataTransferItemList に画像が含まれいない場合は終了する
var imageItems = [...e.clipboardData.items].filter(i => i.type.startsWith('image'));
var imageItems = [...e.clipboardData.items].filter(i => i.type.startsWith('image'))
if (imageItems.length == 0) {
console.warn("it is not image")
return true;
console.warn('it is not image')
return true
}
// ファイルとして得る
// DataTransferItem の kind は file なので getAsString ではなく getAsFile を呼ぶ
var imageFile = imageItems[0].getAsFile();
var imageType = imageItems[0].type;
var imageFile = imageItems[0].getAsFile()
var imageType = imageItems[0].type
// FileReaderで読み込む
var fr = new FileReader();
fr.onload = function (e) {
var fr = new FileReader()
fr.onload = function(e) {
// onload内ではe.target.resultにbase64が入っているのであとは煮るなり焼くなり
var base64 = e.target.result;
var mediav = $("#media").val();
var base64 = e.target.result
var mediav = $('#media').val()
if (mediav) {
var i = mediav.split(",").length;
var i = mediav.split(',').length
}
// DataTransferItem の type に mime tipes があるのでそれを使う
media(base64, imageType, i)
};
fr.readAsDataURL(imageFile);
}
fr.readAsDataURL(imageFile)
// 画像以外がペーストされたときのために、元に戻しておく
});
})
function deleteImage(key) {
Swal.fire({
title: lang.lang_postimg_delete,
@@ -213,19 +256,80 @@ function deleteImage(key) {
cancelButtonColor: '#d33',
confirmButtonText: lang.lang_yesno,
cancelButtonText: lang.lang_no
}).then((result) => {
}).then(result => {
if (result.value) {
var media = $("#media").val();
var arr = media.split(",");
var media = $('#media').val()
var arr = media.split(',')
for (var i = 0; i < media.length; i++) {
if (arr[i] == key) {
arr.splice(i, 1);
break;
arr.splice(i, 1)
break
}
}
$("#media").val(arr.join(","));
$('#preview [data-media=' + key + ']').remove();
$('#media').val(arr.join(','))
$('#preview [data-media=' + key + ']').remove()
}
})
}
function altImage(acct_id, id) {
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/v1/media/' + id
Swal.fire({
title: lang.lang_postimg_desc,
text: lang.lang_postimg_leadContext,
input: 'text',
inputAttributes: {
autocapitalize: 'off'
},
showCancelButton: true,
confirmButtonText: 'Post',
showLoaderOnConfirm: true,
preConfirm: data => {
return fetch(start, {
method: 'PUT',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at
},
body: JSON.stringify({
description: data
})
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
console.log(json)
$('[data-media=' + id + ']').attr('title', data)
})
},
allowOutsideClick: () => !Swal.isLoading()
}).then(result => {
if (result.value) {
Swal.fire({
title: 'Complete'
})
}
})
}
function stamp() {
if ($('#stamp').hasClass('stamp-avail')) {
$('#stamp').html('Off')
$('#stamp').removeClass('stamp-avail')
} else {
$('#stamp').html('On')
$('#stamp').addClass('stamp-avail')
}
}

View File

@@ -1,241 +1,272 @@
//Renpost
function renote(id, acct_id, remote) {
if ($("#pub_" + id).hasClass("rted")) {
return false;
}
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/notes/create";
if (localStorage.getItem("mode_" + domain) != "misskey") {
return false;
}
var httpreq = new XMLHttpRequest();
httpreq.open('POST', start, true);
httpreq.setRequestHeader('Content-Type', 'application/json');
httpreq.responseType = "json";
httpreq.send(JSON.stringify({ i: at, renoteId: id }));
httpreq.onreadystatechange = function () {
if (httpreq.readyState === 4) {
var json = httpreq.response;
console.log(["Success: renote", json]);
$("[toot-id=" + id + "]").addClass("rted");
$(".rt_" + id).toggleClass("teal-text");
}
}
if ($('#pub_' + id).hasClass('rted')) {
return false
}
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/notes/create'
if (localStorage.getItem('mode_' + domain) != 'misskey') {
return false
}
var httpreq = new XMLHttpRequest()
httpreq.open('POST', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
httpreq.responseType = 'json'
httpreq.send(JSON.stringify({ i: at, renoteId: id }))
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
var json = httpreq.response
if (this.status !== 200) {
setLog(start, this.status, json)
}
console.log(['Success: renote', json])
$('[toot-id=' + id + ']').addClass('rted')
$('.rt_' + id).toggleClass('teal-text')
}
}
}
//Renote
function renoteqt(id, acct_id) {
localStorage.setItem("nohide", true);
show();
$("#reply").val("renote_" + id);
$("#rec").text("Renote");
$("#post-acct-sel").val(acct_id);
$("#post-acct-sel").prop("disabled", true);
$('select').formSelect();
$("#textarea").attr("placeholder", lang.lang_misskeyparse_qt);
$("#textarea").focus();
localStorage.setItem('nohide', true)
show()
$('#reply').val('renote_' + id)
$('#rec').text('Renote')
$('#post-acct-sel').val(acct_id)
$('#post-acct-sel').prop('disabled', true)
$('select').formSelect()
$('#textarea').attr('placeholder', lang.lang_misskeyparse_qt)
$('#textarea').focus()
}
//Reply
function misskeyreply(id, acct_id) {
localStorage.setItem("nohide", true);
show();
$("#reply").val(id);
$("#rec").text("Renote");
$("#post-acct-sel").val(acct_id);
$("#post-acct-sel").prop("disabled", true);
$('select').formSelect();
$("#textarea").attr("placeholder", lang.lang_misskeyparse_qt);
$("#textarea").focus();
localStorage.setItem('nohide', true)
show()
$('#reply').val(id)
$('#rec').text('Renote')
$('#post-acct-sel').val(acct_id)
$('#post-acct-sel').prop('disabled', true)
$('select').formSelect()
$('#textarea').attr('placeholder', lang.lang_misskeyparse_qt)
$('#textarea').focus()
}
//Reaction
function reactiontoggle(id, acct_id, tlid) {
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/notes/show";
if (localStorage.getItem("mode_" + domain) != "misskey") {
return false;
}
var httpreq = new XMLHttpRequest();
httpreq.open('POST', start, true);
httpreq.setRequestHeader('Content-Type', 'application/json');
httpreq.responseType = "json";
httpreq.send(JSON.stringify({ i: at, noteId: id }));
httpreq.onreadystatechange = function () {
if (httpreq.readyState === 4) {
var json = httpreq.response;
console.log(["Success: reaction", json]);
if (json.reactions) {
var reactions = ["like", "love", "laugh", "hmm", "surprise", "congrats", "angry", "confused", "pudding", "rip"];
for (var i = 0; i < reactions.length; i++) {
if (json.reactions[reactions[i]]) {
$("#pub_" + id + " .re-" + reactions[i] + "ct").text(json.reactions[reactions[i]])
$("#pub_" + id + " .re-" + reactions[i]).removeClass("hide")
} else {
$("#pub_" + id + " .re-" + reactions[i] + "ct").text(0)
if ($("#pub_" + id + " .reactions").hasClass("fullreact")) {
$("#pub_" + id + " .re-" + reactions[i]).addClass("hide")
} else {
$("#pub_" + id + " .re-" + reactions[i]).removeClass("hide")
}
$("#pub_" + id + " .re-" + reactions[i] + "ct").text(json.reactions[reactions[i]])
}
}
$("#pub_" + id + " .reactions").removeClass("hide");
$("#pub_" + id + " .reactions").toggleClass("fullreact")
} else {
if ($("#pub_" + id + " .reactions").hasClass("fullreact")) {
$("#pub_" + id + " .reactions").addClass("hide")
$("#pub_" + id + " .reactions").removeClass("fullreact")
} else {
$("#pub_" + id + " .reactions").removeClass("hide");
$("#pub_" + id + " .reaction").removeClass("hide");
$("#pub_" + id + " .reactions").addClass("fullreact");
}
}
}
}
$("#pub_" + id + " .freeReact").toggleClass("hide");
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/notes/show'
if (localStorage.getItem('mode_' + domain) != 'misskey') {
return false
}
var httpreq = new XMLHttpRequest()
httpreq.open('POST', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
httpreq.responseType = 'json'
httpreq.send(JSON.stringify({ i: at, noteId: id }))
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
var json = httpreq.response
if (this.status !== 200) {
setLog(start, this.status, json)
}
console.log(['Success: reaction', json])
if (json.reactions) {
var reactions = [
'like',
'love',
'laugh',
'hmm',
'surprise',
'congrats',
'angry',
'confused',
'pudding',
'rip'
]
for (var i = 0; i < reactions.length; i++) {
if (json.reactions[reactions[i]]) {
$('#pub_' + id + ' .re-' + reactions[i] + 'ct').text(json.reactions[reactions[i]])
$('#pub_' + id + ' .re-' + reactions[i]).removeClass('hide')
} else {
$('#pub_' + id + ' .re-' + reactions[i] + 'ct').text(0)
if ($('#pub_' + id + ' .reactions').hasClass('fullreact')) {
$('#pub_' + id + ' .re-' + reactions[i]).addClass('hide')
} else {
$('#pub_' + id + ' .re-' + reactions[i]).removeClass('hide')
}
$('#pub_' + id + ' .re-' + reactions[i] + 'ct').text(json.reactions[reactions[i]])
}
}
$('#pub_' + id + ' .reactions').removeClass('hide')
$('#pub_' + id + ' .reactions').toggleClass('fullreact')
} else {
if ($('#pub_' + id + ' .reactions').hasClass('fullreact')) {
$('#pub_' + id + ' .reactions').addClass('hide')
$('#pub_' + id + ' .reactions').removeClass('fullreact')
} else {
$('#pub_' + id + ' .reactions').removeClass('hide')
$('#pub_' + id + ' .reaction').removeClass('hide')
$('#pub_' + id + ' .reactions').addClass('fullreact')
}
}
}
}
$('#pub_' + id + ' .freeReact').toggleClass('hide')
}
//reactioncustom
function reactioncustom(acct_id, id) {
$("#reply").val(id);
$("#unreact").hide();
$("#addreact").removeClass("hide");
$("#post-acct-sel").val(acct_id);
$('select').formSelect();
localStorage.setItem("nohide", true);
show()
emojiToggle(true)
$("#left-side").hide();
$("#default-emoji").hide();
$('#reply').val(id)
$('#unreact').hide()
$('#addreact').removeClass('hide')
$('#post-acct-sel').val(acct_id)
$('select').formSelect()
localStorage.setItem('nohide', true)
show()
emojiToggle(true)
$('#left-side').hide()
$('#default-emoji').hide()
}
function reactRefresh(acct_id, id) {
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/notes/show";
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/notes/show'
var req = {};
req.i = at;
req.noteId = id;
var i = {
method: "POST",
body: JSON.stringify(req),
}
fetch(start, i,
).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
if (!json) {
return false;
}
var poll = "";
if (json.error) {
$("[toot-id=" + id + "]").hide();
$("[toot-id=" + id + "]").remove();
} else {
reactRefreshCore(json)
}
});
var req = {}
req.i = at
req.noteId = id
var i = {
method: 'POST',
body: JSON.stringify(req)
}
fetch(start, i)
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
if (!json) {
return false
}
var poll = ''
if (json.error) {
$('[toot-id=' + id + ']').hide()
$('[toot-id=' + id + ']').remove()
} else {
reactRefreshCore(json)
}
})
}
function reactRefreshCore(json) {
var id = json.id;
if (json.reactions) {
$("#pub_" + id + " .reactions").removeClass("hide")
var regExp = new RegExp(":", "g");
Object.keys(json.reactions).forEach(function (keye) {
keyeClass = keye.replace(regExp, '');
if (json.reactions[keye]) {
$("#pub_" + id + " .re-" + keyeClass + "ct").text(json.reactions[keye])
$("#pub_" + id + " .re-" + keyeClass).removeClass("hide")
} else {
$("#pub_" + id + " .re-" + keyeClass + "ct").text(0)
if ($("#pub_" + id + " .reactions").hasClass("fullreact")) {
$("#pub_" + id + " .re-" + keyeClass).addClass("hide")
}
$("#pub_" + id + " .re-" + keyeClass + "ct").text(json.reactions[keye])
}
});
}
var id = json.id
if (json.reactions) {
$('#pub_' + id + ' .reactions').removeClass('hide')
var regExp = new RegExp(':', 'g')
Object.keys(json.reactions).forEach(function(keye) {
keyeClass = keye.replace(regExp, '')
if (json.reactions[keye]) {
$('#pub_' + id + ' .re-' + keyeClass + 'ct').text(json.reactions[keye])
$('#pub_' + id + ' .re-' + keyeClass).removeClass('hide')
} else {
$('#pub_' + id + ' .re-' + keyeClass + 'ct').text(0)
if ($('#pub_' + id + ' .reactions').hasClass('fullreact')) {
$('#pub_' + id + ' .re-' + keyeClass).addClass('hide')
}
$('#pub_' + id + ' .re-' + keyeClass + 'ct').text(json.reactions[keye])
}
})
}
}
function emojiReaction(emoji) {
var acct_id = $("#post-acct-sel").val();
var id = $("#reply").val();
reaction(emoji, id, acct_id, null)
clear();
hide();
var acct_id = $('#post-acct-sel').val()
var id = $('#reply').val()
reaction(emoji, id, acct_id, null)
clear()
hide()
}
function reaction(mode, id, acct_id, tlid) {
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
if ($(".fav_" + id).hasClass("yellow-text")) {
var flag = "delete";
} else {
var flag = "create";
}
var start = "https://" + domain + "/api/notes/reactions/" + flag;
if (localStorage.getItem("mode_" + domain) != "misskey") {
return false;
}
var httpreq = new XMLHttpRequest();
httpreq.open('POST', start, true);
httpreq.setRequestHeader('Content-Type', 'application/json');
httpreq.responseType = "json";
httpreq.send(JSON.stringify({ i: at, noteId: id, reaction: mode }));
httpreq.onreadystatechange = function () {
if (httpreq.readyState === 4) {
$(".fav_" + id).toggleClass("yellow-text");
}
}
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
if ($('.fav_' + id).hasClass('yellow-text')) {
var flag = 'delete'
} else {
var flag = 'create'
}
var start = 'https://' + domain + '/api/notes/reactions/' + flag
if (localStorage.getItem('mode_' + domain) != 'misskey') {
return false
}
var httpreq = new XMLHttpRequest()
httpreq.open('POST', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
httpreq.responseType = 'json'
httpreq.send(JSON.stringify({ i: at, noteId: id, reaction: mode }))
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
if (this.status !== 200) {
setLog(start, this.status, this.response)
}
$('.fav_' + id).toggleClass('yellow-text')
}
}
}
//Vote
function vote(acct_id, id, to) {
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/notes/polls/vote";
if (localStorage.getItem("mode_" + domain) != "misskey") {
return false;
}
var httpreq = new XMLHttpRequest();
httpreq.open('POST', start, true);
httpreq.setRequestHeader('Content-Type', 'application/json');
httpreq.responseType = "json";
httpreq.send(JSON.stringify({ i: at, noteId: id, choice: to }));
httpreq.onreadystatechange = function () {
voterefresh(acct_id, id)
}
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/notes/polls/vote'
if (localStorage.getItem('mode_' + domain) != 'misskey') {
return false
}
var httpreq = new XMLHttpRequest()
httpreq.open('POST', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
httpreq.responseType = 'json'
httpreq.send(JSON.stringify({ i: at, noteId: id, choice: to }))
httpreq.onreadystatechange = function() {
voterefresh(acct_id, id)
}
}
function voterefresh(acct_id, id) {
var httpreqd = new XMLHttpRequest();
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/notes/show";
httpreqd.open('POST', start, true);
httpreqd.setRequestHeader('Content-Type', 'application/json');
httpreqd.responseType = 'json';
httpreqd.send(JSON.stringify({ i: at, noteId: id }));
httpreqd.onreadystatechange = function () {
if (httpreqd.readyState == 4) {
var json = httpreqd.response;
if (!json) {
return false;
}
var poll = "";
if (json.poll) {
var choices = json.poll.choices;
Object.keys(choices).forEach(function (keyc) {
var choice = choices[keyc];
if (choice.isVoted) {
var myvote = twemoji.parse("✅");
} else {
var myvote = "";
}
poll = poll + '<div class="pointer vote" onclick="vote(\'' + acct_id + '\',\'' + json.id + '\',' + choice.id + ')">' + escapeHTML(choice.text) + '(' + choice.votes + '' + myvote + ')</div>';
});
$(".vote_" + json.id).html(poll)
}
}
}
}
var httpreqd = new XMLHttpRequest()
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/notes/show'
httpreqd.open('POST', start, true)
httpreqd.setRequestHeader('Content-Type', 'application/json')
httpreqd.responseType = 'json'
httpreqd.send(JSON.stringify({ i: at, noteId: id }))
httpreqd.onreadystatechange = function() {
if (httpreqd.readyState == 4) {
var json = httpreqd.response
if (this.status !== 200) {
setLog(start, this.status, json)
}
if (!json) {
return false
}
var poll = ''
if (json.poll) {
var choices = json.poll.choices
Object.keys(choices).forEach(function(keyc) {
var choice = choices[keyc]
if (choice.isVoted) {
var myvote = twemoji.parse('✅')
} else {
var myvote = ''
}
poll = poll + `<div class="pointer vote" onclick="vote('${acct_id}','${json.id}',"${choice.id}')">${escapeHTML(choice.text)}(${choice.votes})${myvote})</div>`
})
$('.vote_' + json.id).html(poll)
}
}
}
}

View File

@@ -1,36 +1,46 @@
/*投稿系*/
//投稿
function sec() {
var mode = localStorage.getItem("sec");
var acct_id = $("#post-acct-sel").val();
var domain = localStorage.getItem("domain_" + acct_id);
if (~domain.indexOf("kirishima.cloud") >= 0 && mode == "local") {
mode = "unlisted";
var mode = localStorage.getItem('sec')
var acct_id = $('#post-acct-sel').val()
var domain = localStorage.getItem('domain_' + acct_id)
if (~domain.indexOf('kirishima.cloud') >= 0 && mode == 'local') {
mode = 'unlisted'
}
post(null, mode);
post(null, mode)
}
function post(mode, postvis) {
if ($("#toot-post-btn").prop("disabled")) {
return false;
if ($('#toot-post-btn').prop('disabled')) {
return false
}
var str = $("#textarea").val();
var acct_id = $("#post-acct-sel").val();
localStorage.setItem("last-use", acct_id);
var domain = localStorage.getItem("domain_" + acct_id);
if (!localStorage.getItem("cw_sentence")) {
var cw_sent = 500;
var str = $('#textarea').val()
var acct_id = $('#post-acct-sel').val()
localStorage.setItem('last-use', acct_id)
var domain = localStorage.getItem('domain_' + acct_id)
if ($('#ideKey').val() != '') {
var ideKey = $('#ideKey').val()
} else {
var cw_sent = localStorage.getItem("cw_sentence");
var user = localStorage.getItem('user_' + acct_id)
var ideKey = Math.floor(Date.now() / 1000) + '/TheDesk/' + user + '@' + domain
$('#ideKey').val(ideKey)
}
if (!localStorage.getItem("cw_letters")) {
var cw_ltres = 7000;
if (!localStorage.getItem('cw_sentence')) {
var cw_sent = 500
} else {
var cw_ltres = localStorage.getItem("cw_letters");
var cw_sent = localStorage.getItem('cw_sentence')
}
if (domain != "kirishima.cloud") {
if (mode != "pass" && !$("#cw").hasClass("cw-avail") && (str.length > cw_sent || (str.split("\n").length - 1) > cw_ltres)) {
console.log("out")
var plus = str.replace(/\n/g, "").slice(0, 10) + "...";
if (!localStorage.getItem('cw_letters')) {
var cw_ltres = 7000
} else {
var cw_ltres = localStorage.getItem('cw_letters')
}
if (domain != 'kirishima.cloud') {
if (
mode != 'pass' &&
!$('#cw').hasClass('cw-avail') &&
(str.length > cw_sent || str.split('\n').length - 1 > cw_ltres)
) {
var plus = str.replace(/\n/g, '').slice(0, 10) + '...'
Swal.fire({
title: lang.lang_post_cwtitle,
text: lang.lang_post_cwtxt + plus,
@@ -41,35 +51,34 @@ function post(mode, postvis) {
confirmButtonText: lang.lang_post_btn2,
cancelButtonText: lang.lang_post_btn3,
showCloseButton: true,
focusConfirm: false,
}).then((result) => {
console.log(result)
if (result.dismiss == "cancel") {
focusConfirm: false
}).then(result => {
if (result.dismiss == 'cancel') {
//btn3:sonomama
post("pass")
post('pass')
} else if (result.value) {
//btn2:auto-CW
$("#cw-text").show();
$("#cw").addClass("yellow-text");
$("#cw").addClass("cw-avail");
$("#cw-text").val(plus);
post("pass")
$('#cw-text').show()
$('#cw').addClass('yellow-text')
$('#cw').addClass('cw-avail')
$('#cw-text').val(plus)
post('pass')
}
})
return false;
return false
}
}
if (localStorage.getItem("mode_" + domain) == "misskey") {
misskeyPost();
return;
if (localStorage.getItem('mode_' + domain) == 'misskey') {
misskeyPost()
return
}
$(".toot-btn-group").prop("disabled", true);
todo("Posting");
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/v1/statuses";
var reply = $("#reply").val();
if (str.indexOf(localStorage.getItem("stable")) == -1) {
str + " #" + localStorage.getItem("stable");
$('.toot-btn-group').prop('disabled', true)
todo('Posting')
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/v1/statuses'
var reply = $('#reply').val()
if (str.indexOf(localStorage.getItem('stable')) == -1) {
str + ' #' + localStorage.getItem('stable')
}
var toot = {
status: str
@@ -77,62 +86,66 @@ function post(mode, postvis) {
if (reply) {
toot.in_reply_to_id = reply
}
var media = $("#media").val();
var media = $('#media').val()
if (media) {
toot.media_ids = media.split(",");
toot.media_ids = media.split(',')
}
if ($("#nsfw").hasClass("nsfw-avail")) {
var nsfw = "true";
toot.sensitive = nsfw;
var quote = $('#quote').val()
if (quote) {
toot.quote_id = quote
}
if ($('#nsfw').hasClass('nsfw-avail')) {
var nsfw = 'true'
toot.sensitive = nsfw
} else {
var nsfw = "false";
var nsfw = 'false'
}
if (postvis) {
var vis = postvis;
var vis = postvis
} else {
var vis = $("#vis").text();
var vis = $('#vis').text()
}
if (vis != "inherit" && vis != "local") {
toot.visibility = vis;
} else if (vis == "local") {
toot.status = str + "👁️";
if (vis != 'inherit' && vis != 'local') {
toot.visibility = vis
} else if (vis == 'local') {
toot.status = str + '👁️'
}
if ($("#cw").hasClass("cw-avail")) {
var spo = $("#cw-text").val();
cw();
toot.spoiler_text = spo;
if ($('#cw').hasClass('cw-avail')) {
var spo = $('#cw-text').val()
cw()
toot.spoiler_text = spo
} else {
var spo = "";
var spo = ''
}
if ($("#sch-box").hasClass("sch-avail")) {
var scheduled = formattimeutc(new Date(Date.parse($("#sch-date").val())))
console.log("This toot will be posted at:" + scheduled)
schedule();
toot.scheduled_at = scheduled;
if ($('#sch-box').hasClass('sch-avail')) {
var scheduled = formattimeutc(new Date(Date.parse($('#sch-date').val())))
console.log('This toot will be posted at:' + scheduled)
schedule()
toot.scheduled_at = scheduled
} else {
var scheduled = "";
var scheduled = ''
}
if ($("#poll-sel").val() == "mastodon-poll") {
var options = [];
$(".mastodon-choice").map(function () {
var choice = $(this).val();
if (choice != "") {
options.push(choice);
if (!$('#poll').hasClass('hide')) {
var options = []
$('.mastodon-choice').map(function() {
var choice = $(this).val()
if (choice != '') {
options.push(choice)
}
});
if ($("#poll-multiple:checked").val() == "1") {
var mul = true;
})
if ($('#poll-multiple:checked').val() == '1') {
var mul = true
} else {
var mul = false;
var mul = false
}
if ($("#poll-until:checked").val() == "1") {
var htt = true;
if ($('#poll-until:checked').val() == '1') {
var htt = true
} else {
var htt = false;
var htt = false
}
var exin = pollCalc();
var exin = pollCalc()
if (!exin) {
todc("Error: Poll expires_in param")
todc('Error: Poll expires_in param')
}
toot.poll = {
options: options,
@@ -141,151 +154,180 @@ function post(mode, postvis) {
hide_totals: htt
}
}
console.table(toot);
var httpreq = new XMLHttpRequest();
httpreq.open('POST', start, true);
httpreq.setRequestHeader('Content-Type', 'application/json');
httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
httpreq.responseType = "json";
httpreq.send(JSON.stringify(toot));
httpreq.onreadystatechange = function () {
console.table(toot)
var httpreq = new XMLHttpRequest()
httpreq.open('POST', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.setRequestHeader('Idempotency-Key', ideKey)
httpreq.responseType = 'json'
httpreq.send(JSON.stringify(toot))
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
var json = httpreq.response;
var box = localStorage.getItem("box");
if (box == "yes" || !box) {
$("#textarea").blur();
hide();
var json = httpreq.response
if (this.status !== 200) {
setLog(start, this.status, json)
} else {
$('#ideKey').val('')
}
$(".toot-btn-group").prop("disabled", false);
todc();
clear();
var box = localStorage.getItem('box')
if (box == 'yes' || !box) {
$('#textarea').blur()
hide()
}
$('.toot-btn-group').prop('disabled', false)
todc()
clear()
}
}
}
function misskeyPost() {
var str = $("#textarea").val();
var acct_id = $("#post-acct-sel").val();
localStorage.setItem("last-use", acct_id);
var domain = localStorage.getItem("domain_" + acct_id);
$(".toot-btn-group").prop("disabled", true);
todo("Posting");
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/notes/create";
var reply = $("#reply").val();
var str = $('#textarea').val()
var acct_id = $('#post-acct-sel').val()
localStorage.setItem('last-use', acct_id)
var domain = localStorage.getItem('domain_' + acct_id)
$('.toot-btn-group').prop('disabled', true)
todo('Posting')
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/notes/create'
var reply = $('#reply').val()
var toot = {
text: str
}
if (reply) {
if (reply.indexOf("renote") !== -1) {
toot.renoteId = reply.replace("renote_", "")
if (reply.indexOf('renote') !== -1) {
toot.renoteId = reply.replace('renote_', '')
} else {
toot.replyId = reply
}
}
var media = $("#media").val();
var media = $('#media').val()
if (media) {
toot.mediaIds = media.split(",");
toot.mediaIds = media.split(',')
}
if ($("#nsfw").hasClass("nsfw-avail")) {
var nsfw = "true";
toot.sensitive = nsfw;
if ($('#nsfw').hasClass('nsfw-avail')) {
var nsfw = 'true'
toot.sensitive = nsfw
} else {
var nsfw = "false";
var nsfw = 'false'
}
var vis = $("#vis").text();
if (vis == "unlisted") {
vis = "home"
} else if (vis == "direct") {
vis = "specified";
toot.visibleUserIds = str.match(/@([a-zA-Z0-9_@.-]+)(\s|$)/g).join('').split("@");
var vis = $('#vis').text()
if (vis == 'unlisted') {
vis = 'home'
} else if (vis == 'direct') {
vis = 'specified'
toot.visibleUserIds = str
.match(/@([a-zA-Z0-9_@.-]+)(\s|$)/g)
.join('')
.split('@')
}
if (vis != "inherit") {
toot.visibility = vis;
if (vis != 'inherit') {
toot.visibility = vis
}
if ($("#cw").hasClass("cw-avail")) {
var spo = $("#cw-text").val();
cw();
toot.cw = spo;
if ($('#cw').hasClass('cw-avail')) {
var spo = $('#cw-text').val()
cw()
toot.cw = spo
} else {
var spo = "";
var spo = ''
}
toot.i = at;
var httpreq = new XMLHttpRequest();
httpreq.open('POST', start, true);
httpreq.setRequestHeader('Content-Type', 'application/json');
httpreq.responseType = "json";
httpreq.send(JSON.stringify(toot));
httpreq.onreadystatechange = function () {
toot.i = at
var httpreq = new XMLHttpRequest()
httpreq.open('POST', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
httpreq.responseType = 'json'
httpreq.send(JSON.stringify(toot))
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
if (str.indexOf(localStorage.getItem("stable")) == -1) {
localStorage.removeItem("stable")
if (str.indexOf(localStorage.getItem('stable')) == -1) {
localStorage.removeItem('stable')
}
var json = httpreq.response;
console.log(["Success: toot", json]);
var box = localStorage.getItem("box");
if (box == "yes") {
hide();
} else if (box == "hide") {
$("body").addClass("mini-post");
$(".mini-btn").text("expand_less");
var json = httpreq.response
if (this.status !== 200) {
setLog(start, this.status, json)
}
$(".toot-btn-group").prop("disabled", false);
todc();
clear();
console.log(['Success: toot', json])
var box = localStorage.getItem('box')
if (box == 'yes') {
hide()
} else if (box == 'hide') {
$('body').addClass('mini-post')
$('.mini-btn').text('expand_less')
}
$('.toot-btn-group').prop('disabled', false)
todc()
clear()
}
}
}
//クリア(Shift+C)
function clear() {
$("#textarea").val("");
if (localStorage.getItem("stable")) {
$("#textarea").val("#" + localStorage.getItem("stable") + " ")
$('#textarea').val('')
$('#ideKey').val('')
if (localStorage.getItem('stable')) {
$('#textarea').val('#' + localStorage.getItem('stable') + ' ')
}
$("#textarea").attr("placeholder", lang.lang_toot);
$("#reply").val("");
$("#media").val("");
var cwt = localStorage.getItem("cw-text");
$('#textarea').attr('placeholder', lang.lang_toot)
$('#reply').val('')
$('#quote').val('')
$('#media').val('')
var cwt = localStorage.getItem('cw-text')
if (cwt) {
$("#cw-text").val(cwt);
$('#cw-text').val(cwt)
} else {
$("#cw-text").val("");
$('#cw-text').val('')
}
var acw = localStorage.getItem("always-cw");
if (acw != "yes") {
$("#cw").removeClass("yellow-text");
$("#cw").removeClass("cw-avail");
$("#cw-text").hide();
var acw = localStorage.getItem('always-cw')
if (acw != 'yes') {
$('#cw').removeClass('yellow-text')
$('#cw').removeClass('cw-avail')
$('#cw-text').hide()
} else {
$("#cw").addClass("yellow-text");
$("#cw").addClass("cw-avail");
$("#cw-text").show();
$('#cw').addClass('yellow-text')
$('#cw').addClass('cw-avail')
$('#cw-text').show()
}
$("#rec").text(lang.lang_no);
$("#mec").text(lang.lang_nothing);
loadVis();
$("#nsfw").removeClass("yellow-text");
$("#nsfw").html("visibility_off");
$("#nsfw").removeClass("nsfw-avail");
$("#nsc").text(lang.lang_nothing);
$("#drag").css("background-color", "#e0e0e0");
$("#preview").html("");
$(".toot-btn-group").prop("disabled", false);
$("#post-acct-sel").prop("disabled", false);
$("#days_poll").val(0);
$("#hours_poll").val(0);
$("#mins_poll").val(6);
$(".mastodon-choice").map(function () {
$(this).val("");
});
localStorage.removeItem("image");
if (localStorage.getItem("mainuse") == "main") {
$("#post-acct-sel").val(localStorage.getItem("main"));
$('#rec').text(lang.lang_no)
$('#mec').text(lang.lang_nothing)
loadVis()
$('#nsfw').removeClass('yellow-text')
$('#nsfw').html('visibility_off')
$('#nsfw').removeClass('nsfw-avail')
$('#stamp').html('Off')
$('#stamp').removeClass('stamp-avail')
$('#nsc').text(lang.lang_nothing)
$('#drag').css('background-color', '#e0e0e0')
$('#preview').html('')
$('.toot-btn-group').prop('disabled', false)
$('#post-acct-sel').prop('disabled', false)
$('#days_poll').val(0)
$('#hours_poll').val(0)
$('#mins_poll').val(6)
$('#poll').addClass('hide')
$('#pollsta').text(lang.lang_no)
$('.mastodon-choice').map(function() {
$(this).val('')
})
localStorage.removeItem('image')
if (localStorage.getItem('mainuse') == 'main') {
$('#post-acct-sel').val(localStorage.getItem('main'))
}
$('select').formSelect();
$("#left-side").show();
$("#default-emoji").show();
$("#unreact").show();
$("#addreact").addClass("hide");
}
$('#emoji').addClass('hide')
$('select').formSelect()
$('#default-emoji').show()
$('#unreact').show()
$('#addreact').addClass('hide')
$('#right-side').hide()
$('#right-side').css('width', '300px')
$('#left-side').css('width', '100%')
var width = localStorage.getItem('postbox-width')
if (width) {
width = width.replace('px', '') * 1
} else {
width = 300
}
$('#post-box').css('width', width)
mdCheck()
}

View File

@@ -1,130 +1,128 @@
/*保護系*/
//画像保護
function nsfw() {
if ($("#nsfw").hasClass("nsfw-avail")) {
$("#nsfw").removeClass("yellow-text");
$("#nsfw").html("visibility_off");
$("#nsfw").removeClass("nsfw-avail");
if ($('#nsfw').hasClass('nsfw-avail')) {
$('#nsfw').removeClass('yellow-text')
$('#nsfw').html('visibility_off')
$('#nsfw').removeClass('nsfw-avail')
} else {
$("#nsfw").addClass("yellow-text");
$("#nsfw").html("visibility");
$("#nsfw").addClass("nsfw-avail");
$('#nsfw').addClass('yellow-text')
$('#nsfw').html('visibility')
$('#nsfw').addClass('nsfw-avail')
}
}
//投稿公開範囲
function vis(set) {
$("#vis").text(set);
$("#vis-icon").removeClass("red-text");
$("#vis-icon").removeClass("orange-text");
$("#vis-icon").removeClass("blue-text");
$("#vis-icon").removeClass("purple-text");
$("#vis-icon").removeClass("light-blue-text");
$("#vis-icon").removeClass("teal-text");
if (set == "public") {
$("#vis-icon").text("public");
$("#vis-icon").addClass("purple-text");
} else if (set == "unlisted") {
$("#vis-icon").text("lock_open");
$("#vis-icon").addClass("blue-text");
} else if (set == "private") {
$("#vis-icon").text("lock");
$("#vis-icon").addClass("orange-text");
} else if (set == "direct") {
$("#vis-icon").text("mail");
$("#vis-icon").addClass("red-text");
} else if (set == "limited") {
$("#vis-icon").text("group");
$("#vis-icon").addClass("teal-text");
} else if (set == "local") {
$("#vis-icon").text("visibility");
$("#vis-icon").addClass("light-blue-text");
$('#vis').text(set)
$('#vis-icon').removeClass('red-text')
$('#vis-icon').removeClass('orange-text')
$('#vis-icon').removeClass('blue-text')
$('#vis-icon').removeClass('purple-text')
$('#vis-icon').removeClass('light-blue-text')
$('#vis-icon').removeClass('teal-text')
if (set == 'public') {
$('#vis-icon').text('public')
$('#vis-icon').addClass('purple-text')
} else if (set == 'unlisted') {
$('#vis-icon').text('lock_open')
$('#vis-icon').addClass('blue-text')
} else if (set == 'private') {
$('#vis-icon').text('lock')
$('#vis-icon').addClass('orange-text')
} else if (set == 'direct') {
$('#vis-icon').text('mail')
$('#vis-icon').addClass('red-text')
} else if (set == 'limited') {
$('#vis-icon').text('group')
$('#vis-icon').addClass('teal-text')
} else if (set == 'local') {
$('#vis-icon').text('visibility')
$('#vis-icon').addClass('light-blue-text')
}
var vis = localStorage.getItem("vis");
if (vis == "memory") {
var acct_id = $("#post-acct-sel").val();
localStorage.setItem("vis-memory-" + acct_id, set);
var vis = localStorage.getItem('vis')
if (vis == 'memory') {
var acct_id = $('#post-acct-sel').val()
localStorage.setItem('vis-memory-' + acct_id, set)
}
var ins = M.Dropdown.getInstance($('#dropdown1'))
if(ins){
ins.close();
if (ins) {
ins.close()
}
}
function loadVis() {
var vist = localStorage.getItem("vis");
var vist = localStorage.getItem('vis')
if (!vist) {
vis("public");
vis('public')
} else {
if (vist == "memory") {
var acct_id = $("#post-acct-sel").val();
var memory = localStorage.getItem("vis-memory-" + acct_id);
if (vist == 'memory') {
var acct_id = $('#post-acct-sel').val()
var memory = localStorage.getItem('vis-memory-' + acct_id)
if (!memory) {
memory = "public";
memory = 'public'
}
vis(memory);
} else if (vist == "useapi") {
var acct_id = $("#post-acct-sel").val();
var multi = localStorage.getItem("multi");
var obj = JSON.parse(multi);
var memory = obj[acct_id]["vis"];
vis(memory)
} else if (vist == 'useapi') {
var acct_id = $('#post-acct-sel').val()
var multi = localStorage.getItem('multi')
var obj = JSON.parse(multi)
var memory = obj[acct_id]['vis']
if (!memory) {
memory = "public";
memory = 'public'
}
vis(memory);
vis(memory)
} else {
vis(vist);
vis(vist)
}
}
}
loadVis();
loadVis()
//コンテントワーニング
function cw() {
if ($("#cw").hasClass("cw-avail")) {
$("#cw-text").val();
$("#cw-text").hide();
$("#cw").removeClass("yellow-text");
$("#cw").removeClass("cw-avail");
if ($('#cw').hasClass('cw-avail')) {
$('#cw-text').val()
$('#cw-text').hide()
$('#cw').removeClass('yellow-text')
$('#cw').removeClass('cw-avail')
} else {
$("#cw-text").show();
$("#cw").addClass("yellow-text");
$("#cw").addClass("cw-avail");
var cwt = localStorage.getItem("cw-text");
$('#cw-text').show()
$('#cw').addClass('yellow-text')
$('#cw').addClass('cw-avail')
var cwt = localStorage.getItem('cw-text')
if (cwt) {
$("#cw-text").val(cwt);
$('#cw-text').val(cwt)
}
}
}
//TLでコンテントワーニングを表示トグル
function cw_show(id) {
$(".cw_hide_" + id).toggleClass("cw");
$(".cw-long-" + id).toggleClass("hide");
$('.cw_hide_' + id).toggleClass('cw')
$('.cw-long-' + id).toggleClass('hide')
}
$(function () {
$('#cw-text').on('change', function (event) {
var acct_id = $("#post-acct-sel").val();
var domain = localStorage.getItem("domain_" + acct_id);
var cwlen = $('#cw-text').val().length;
$(function() {
$('#cw-text').on('change', function(event) {
var acct_id = $('#post-acct-sel').val()
var domain = localStorage.getItem('domain_' + acct_id)
var cwlen = $('#cw-text').val().length
if (idata[domain + "_letters"]) {
$("#textarea").attr("data-length", idata[domain + "_letters"] - cwlen)
if (idata[domain + '_letters']) {
$('#textarea').attr('data-length', idata[domain + '_letters'] - cwlen)
} else {
$("#textarea").attr("data-length", 500 - cwlen)
$('#textarea').attr('data-length', 500 - cwlen)
}
});
});
})
})
//スケジュール
function schedule() {
if ($("#sch-box").hasClass("sch-avail")) {
$("#sch-box").hide();
$("#sch-box").removeClass("sch-avail");
if ($('#sch-box').hasClass('sch-avail')) {
$('#sch-box').hide()
$('#sch-box').removeClass('sch-avail')
} else {
var date = new Date();
var date = new Date()
$("#sch-box").show();
$("#sch-date").val(formattime(date));
$("#sch-box").addClass("sch-avail");
$('#sch-box').show()
$('#sch-date').val(formattime(date))
$('#sch-box').addClass('sch-avail')
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,179 +1,279 @@
//入力時にハッシュタグと@をサジェスト
var timer = null;
var timer = null
var input = document.getElementById("textarea");
var input = document.getElementById('textarea')
var prev_val = input.value;
var oldSuggest;
var suggest;
var prev_val = input.value
var oldSuggest
var suggest
input.addEventListener("focus", function () {
var acct_id = $("#post-acct-sel").val();
$("#suggest").html("");
window.clearInterval(timer);
timer = window.setInterval(function () {
var new_val = input.value;
if (new_val == "") {
$("#suggest").html("");
if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
$("#right-side").hide()
}
return;
}
if (prev_val != new_val) {
var semoji = new_val.match(/:(\S{3,})/);
if (semoji) {
var obj = JSON.parse(localStorage.getItem("emoji_" + acct_id));
if (!obj) {
var ehtml = lang.lang_suggest_nodata;
} else {
var num = obj.length;
var ehtml = "";
for (i = 0; i < num; i++) {
var emoji = obj[i];
if (~emoji.shortcode.indexOf(semoji[1])) {
if (emoji) {
ehtml = ehtml + '<a onclick="emojiInsert(\':' + emoji.shortcode +
': \',\':' + semoji[1] + '\')" class="pointer"><img src="' + emoji.url + '" width="20"></a>';
}
}
}
}
if (ehtml != "") {
$("#right-side").show()
$("#poll").addClass("hide")
$("#emoji").addClass("hide")
} else {
if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
$("#right-side").hide()
}
}
$("#suggest").html(ehtml);
}
var tag = new_val.match(/#(\S{3,})/);
var acct = new_val.match(/@(\S{3,})/);
if (tag && tag[1]) {
var q = tag[1];
} else if (acct && acct[1]) {
var q = acct[1];
} else {
$("#suggest").html("");
if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
$("#right-side").hide()
}
return;
}
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
suggest = "https://" + domain + "/api/v1/search?q=" + q
if (suggest != oldSuggest) {
console.log("Try to get suggest at " + suggest)
fetch(suggest, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
if (json.hashtags[0] && tag) {
if (tag[1]) {
var tags = "";
Object.keys(json.hashtags).forEach(function (key4) {
var tag = json.hashtags[key4];
if (tag != q) {
tags = tags + '<a onclick="tagInsert(\'#' + tag + '\',\'#' + q +
'\')" class="pointer">#' + tag + '</a><br>';
}
});
$("#right-side").show()
$("#suggest").html("Tags:<br>" + tags);
$("#poll").addClass("hide")
$("#emoji").addClass("hide")
}
} else if (json.accounts[0] && acct[1]) {
var accts = "";
Object.keys(json.accounts).forEach(function (key3) {
var acct = json.accounts[key3];
if (acct.acct != q) {
accts = accts + '<a onclick="tagInsert(\'@' + acct.acct +
'\',\'@' + q + '\')" class="pointer">@' + acct.acct + '</a><br>';
}
});
$("#right-side").show()
$("#suggest").html(accts);
$("#poll").addClass("hide")
$("#emoji").addClass("hide")
input.addEventListener(
'focus',
function() {
localStorage.removeItem('cursor')
var acct_id = $('#post-acct-sel').val()
$('#suggest').html('')
window.clearInterval(timer)
timer = window.setInterval(function() {
var new_val = input.value
if (new_val == '') {
$('#suggest').html('')
if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) {
$('#right-side').hide()
$('#right-side').css('width', '300px')
$('#left-side').css('width', '100%')
var width = localStorage.getItem('postbox-width')
if (width) {
width = width.replace('px', '') * 1
} else {
if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
$("#right-side").hide()
}
width = 300
}
});
$('#post-box').css('width', width + 'px')
}
return
}
};
oldSuggest = suggest;
prev_value = new_val;
}, 1000);
}, false);
if (prev_val != new_val) {
var tag = new_val.match(/#(\S{3,})/)
var acct = new_val.match(/@(\S{3,})/)
if (tag && tag[1]) {
var q = tag[1]
} else if (acct && acct[1]) {
var q = acct[1]
} else {
$('#suggest').html('')
if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) {
$('#right-side').hide()
$('#right-side').css('width', '300px')
$('#left-side').css('width', '100%')
var width = localStorage.getItem('postbox-width')
if (width) {
width = width.replace('px', '') * 1
} else {
width = 300
}
$('#post-box').css('width', width + 'px')
}
return
}
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
suggest = 'https://' + domain + '/api/v2/search?q=' + q
if (suggest != oldSuggest) {
console.log('Try to get suggest at ' + suggest)
fetch(suggest, {
method: 'GET',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at
}
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
console.log(['Search', json])
//ハッシュタグ
if (json.hashtags[0] && tag) {
if (tag[1]) {
var tags = []
Object.keys(json.hashtags).forEach(function(key4) {
var tag = json.hashtags[key4]
var his = tag.history
var uses =
his[0].uses * 1 +
his[1].uses * 1 +
his[2].uses * 1 +
his[3].uses * 1 +
his[4].uses * 1 +
his[5].uses * 1 +
his[6].uses * 1
tagHTML = `<br><a onclick="tagInsert('#${escapeHTML(
tag.name
)}','#${q}')" class="pointer">#${escapeHTML(tag.name)}</a>&nbsp;${uses}toot(s)`
input.addEventListener("blur", function () {
window.clearInterval(timer);
favTag();
}, false);
var item = {
uses: uses,
html: tagHTML
}
tags.push(item)
})
var num_a = -1
var num_b = 1
tags = tags.sort(function(a, b) {
var x = a['uses']
var y = b['uses']
if (x > y) return num_a
if (x < y) return num_b
return 0
})
var ins = ''
var nev = false
Object.keys(tags).forEach(function(key7) {
ins = ins + tags[key7].html
if (key7 <= 0 && !nev) {
ins = ins + '<br>'
nev = true
}
})
$('#suggest').html(ins)
$('#right-side').show()
$('#right-side').css('width', '200px')
$('#left-side').css('width', 'calc(100% - 200px)')
var width = localStorage.getItem('postbox-width')
if (width) {
width = width.replace('px', '') * 1 + 200
} else {
width = 500
}
$('#post-box').css('width', width + 'px')
$('#poll').addClass('hide')
$('#emoji').addClass('hide')
}
} else if (json.accounts[0] && acct[1]) {
var accts = ''
Object.keys(json.accounts).forEach(function(key3) {
var acct = json.accounts[key3]
if (acct.acct != q) {
//Instance Actorって…
if (acct.username.indexOf('.') < 0) {
accts =
accts +
`<a onclick="tagInsert('@${acct.acct}','@${q}')" class="pointer">@${acct.acct}</a><br>`
}
}
})
$('#right-side').show()
$('#right-side').css('width', '200px')
$('#left-side').css('width', 'calc(100% - 200px)')
var width = localStorage.getItem('postbox-width')
if (width) {
width = width.replace('px', '') * 1 + 200
} else {
width = 500
}
$('#post-box').css('width', width + 'px')
$('#suggest').html(accts)
$('#poll').addClass('hide')
$('#emoji').addClass('hide')
} else {
if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) {
$('#right-side').hide()
$('#right-side').css('width', '300px')
$('#left-side').css('width', '100%')
var width = localStorage.getItem('postbox-width')
if (width) {
width = width.replace('px', '') * 1
} else {
width = 300
}
$('#post-box').css('width', width + 'px')
}
}
})
}
}
oldSuggest = suggest
prev_value = new_val
}, 1000)
},
false
)
input.addEventListener(
'blur',
function() {
window.clearInterval(timer)
favTag()
},
false
)
function tagInsert(code, del) {
var now = $("#textarea").val();
var selin = $("#textarea").prop('selectionStart');
if (!del) {
var blankBefore = ' '
var blankAfter = ' '
var textarea = document.querySelector('#textarea')
var sentence = textarea.value
var len = sentence.length
var pos = textarea.selectionStart
if (del) {
var delLen = del.length
} else {
var regExp = new RegExp(del.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
var now = now.replace(regExp, "");
selin = selin - del.length;
var delLen = 0
}
if (selin > 0) {
var before = now.substr(0, selin);
var after = now.substr(selin, now.length);
newt = before + " " + code + " " + after;
var before = sentence.substr(0, pos - delLen)
var last = before.substr(-1, 1)
if (last == ' ') blankBefore = ''
var after = sentence.substr(pos, len)
var start = after.substr(0, 1)
if (start == ' ') blankAfter = ''
if (len == 0) {
var word = code
} else if (len == pos) {
var word = blankBefore + code
} else if (pos == 0) {
var word = code + blankAfter
} else {
newt = code + " " + now;
var word = blankBefore + code + blankAfter
}
$("#textarea").val(newt);
$("#textarea").focus();
if ($("#poll").hasClass("hide") && $("#emoji").hasClass("hide")) {
$("#right-side").hide()
sentence = before + word + after
textarea.value = sentence
if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) {
$('#right-side').hide()
$('#right-side').css('width', '300px')
$('#left-side').css('width', '50%')
var width = localStorage.getItem('postbox-width').replace('px', '') * 1
if (!width) {
width = 300
}
$('#post-box').css('width', width + 'px')
}
$("#suggest").html("");
$('#suggest').html('')
}
function cgNPs(q) {
suggest = "https://cg.toot.app/api/v1/search/light?q=" + q
suggest = 'https://cg.toot.app/api/v1/search/light?q=' + q
if (suggest != oldSuggest) {
console.log("Try to get suggest at " + suggest)
console.log('Try to get suggest at ' + suggest)
fetch(suggest, {
method: 'GET',
headers: {
'content-type': 'application/json'
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
if (json[0]) {
var tags = "";
Object.keys(json).forEach(function (key4) {
var tag = json[key4];
tags = tags + '<a onclick="cgNP(\'' + json[key4] + '\')" class="pointer">' + escapeHTML(json[key4]) + '</a> ';
});
$("#suggest").html("Cinderella NowPlaying:" + tags);
} else {
$("#suggest").html("Cinderella NowPlaying:Not Found");
}
});
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
if (json[0]) {
var tags = ''
Object.keys(json).forEach(function(key4) {
var tag = json[key4]
tags =
tags +
`<a onclick="cgNp('${json[key4]}')" class="pointer">${escapeHTML(json[key4])}</a>`
})
$('#suggest').html('Cinderella NowPlaying:' + tags)
} else {
$('#suggest').html('Cinderella NowPlaying:Not Found')
}
})
}
}
}

View File

@@ -1,64 +1,81 @@
/*リプライ*/
function re(id, ats_cm, acct_id, mode) {
clear();
var ats = ats_cm.split(',');
localStorage.setItem("nohide", true);
show();
$("#reply").val(id);
clear()
var ats = ats_cm.split(',')
localStorage.setItem('nohide', true)
show()
$('#reply').val(id)
for (var i = 0; i < ats.length; i++) {
var at = ats[i];
var te = $("#textarea").val();
if (at != localStorage.getItem("user_" + acct_id)) {
$("#textarea").val("@" + at + " " + te);
var at = ats[i]
var te = $('#textarea').val()
if (at != localStorage.getItem('user_' + acct_id)) {
$('#textarea').val('@' + at + ' ' + te)
}
}
$("#rec").text(lang.lang_yesno);
$("#post-acct-sel").val(acct_id);
$("#post-acct-sel").prop("disabled", true);
$('select').formSelect();
$("#textarea").attr("placeholder", lang.lang_usetxtbox_reply);
$("#textarea").focus();
var profimg = localStorage.getItem("prof_" + acct_id);
$('#rec').text(lang.lang_yesno)
$('#post-acct-sel').val(acct_id)
$('#post-acct-sel').prop('disabled', true)
$('select').formSelect()
mdCheck()
$('#textarea').attr('placeholder', lang.lang_usetxtbox_reply)
$('#textarea').focus()
var profimg = localStorage.getItem('prof_' + acct_id)
if (!profimg) {
profimg = "../../img/missing.svg";
profimg = '../../img/missing.svg'
}
$("#acct-sel-prof").attr("src", profimg);
vis(mode);
$('#acct-sel-prof').attr('src', profimg)
vis(mode)
}
function reEx(id) {
$('#tootmodal').modal('close');
var at = $("#tootmodal").attr("data-user");
var acct_id = $("#status-acct-sel").val();
var mode = $("#tootmodal .vis-data").attr("data-vis");
re(id, at, acct_id, mode);
$('#tootmodal').modal('close')
var at = $('#tootmodal').attr('data-user')
var acct_id = $('#status-acct-sel').val()
var mode = $('#tootmodal .vis-data').attr('data-vis')
re(id, at, acct_id, mode)
}
//引用
function qt(id, acct_id, at, url) {
localStorage.setItem("nohide", true);
var qt = localStorage.getItem("quote");
localStorage.setItem('nohide', true)
var qt = localStorage.getItem('quote')
if (!qt) {
var qt = "simple";
var qt = 'simple'
}
if (qt == "nothing") {
return false;
if (qt == 'nothing') {
return false
}
if (qt == "simple") {
show();
$("#textarea").val("\n" + url);
} else if (qt == "mention") {
show();
$("#textarea").val("\n" + url + " From:@" + at);
} else if (qt == "full") {
show();
var html = $("[toot-id=" + id + "] .toot").html();
html = html.match(/^<p>(.+)<\/p>$/)[1];
html = html.replace(/<br\s?\/?>/, "\n");
html = html.replace(/<p>/, "\n");
html = html.replace(/<\/p>/, "\n");
html = $.strip_tags(html);
$("#textarea").val("\n" + "@" + at + " " + html + "\n" + url);
if (qt == 'simple') {
show()
$('#textarea').val('\n' + url)
} else if (qt == 'mention') {
show()
$('#textarea').val('\n' + url + ' From:@' + at)
} else if (qt == 'full') {
show()
var html = $('[toot-id=' + id + '] .toot').html()
html = html.match(/^<p>(.+)<\/p>$/)[1]
html = html.replace(/<br\s?\/?>/, '\n')
html = html.replace(/<p>/, '\n')
html = html.replace(/<\/p>/, '\n')
html = $.strip_tags(html)
$('#textarea').val('\n' + '@' + at + ' ' + html + '\n' + url)
} else if (qt == 'apiQuote') {
clear()
localStorage.setItem('nohide', true)
show()
$('#quote').val(id)
$('#post-acct-sel').val(acct_id)
$('#post-acct-sel').prop('disabled', true)
$('select').formSelect()
$('#textarea').attr('placeholder', lang.lang_usetxtbox_reply)
$('#textarea').focus()
var profimg = localStorage.getItem('prof_' + acct_id)
if (!profimg) {
profimg = '../../img/missing.svg'
}
$('#acct-sel-prof').attr('src', profimg)
}
$("#textarea").focus();
$("#post-acct-sel").val(acct_id);
$('select').formSelect();
}
$('#post-acct-sel').val(acct_id)
$('select').formSelect()
mdCheck()
$('#textarea').focus()
}

View File

@@ -4,277 +4,389 @@ function additional(acct_id, tlid) {
//メンション系
//$(".mention").attr("href", "");
$("#timeline-container .mention").addClass("parsed");
$('#timeline-container .mention').addClass('parsed')
$("#timeline-container .hashtag").each(function (i, elem) {
var tags = $(this).attr("href").match(
/https?:\/\/([-a-zA-Z0-9@.]+)\/tags\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/
);
$(this).attr("href", "#");
$('#timeline-container .hashtag, #timeline-container [rel=tag]').each(function(i, elem) {
var tags = $(this)
.attr('href')
.match(/https?:\/\/([-a-zA-Z0-9@.]+)\/tags?\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/)
if (tags) {
if (tags[2]) {
$(this).attr("onclick", 'tagShow(\'' + tags[2] + '\')');
}
var tagThis = tags[2]
} else {
var tagThis = $(this).attr('data-regTag')
}
});
if (tagThis) {
$(this).attr('href', "javascript:tagShow('" + tagThis + "')")
}
})
//トゥートサムネ
$("#timeline_" + tlid + " .toot a:not(.parsed)").each(function (i, elem) {
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
var card = localStorage.getItem("card_" + tlid);
var text = $(this).attr('href');
$('#timeline_' + tlid + ' .toot a:not(.parsed)').each(function(i, elem) {
var text = $(this).attr('href')
if (text) {
if (text.indexOf("twimg.com") === -1) {
if (text.indexOf('twimg.com') === -1) {
var urls = text.match(
/https?:\/\/([-a-zA-Z0-9@.]+)\/media\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/
);
)
}
} else {
text = ""
text = ''
var urls = []
}
//トゥートのURLぽかったら
toot = text.match(/https:\/\/([a-zA-Z0-9.-]+)\/@([a-zA-Z0-9_]+)\/([0-9]+)/);
toot = text.match(/https:\/\/([a-zA-Z0-9.-]+)\/@([a-zA-Z0-9_]+)\/([0-9]+)/)
if (toot) {
if (toot[1]) {
$(this).attr("data-acct", acct_id);
$(this).attr('data-acct', acct_id)
}
}
if (urls) {
$(this).remove();
} else if (!card) {
var id = $(this).parents('.cvo').attr("toot-id");
if (localStorage.getItem("mode_" + domain) == "misskey") {
var start = "https://" + domain + "/url?url=" + text;
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json'
},
//body: JSON.stringify({})
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
if (json.title) {
$("[toot-id=" + id + "] .additional").html(
"<span class=\"gray\">URL" + lang.lang_cards_check + ":<br>Title:" + escapeHTML(json.title) + "<br>" +
escapeHTML(json.description) + "</span>");
$("[toot-id=" + id + "] a:not(.parsed)").addClass("parsed");
$("[toot-id=" + id + "]").addClass("parsed");
}
});
}
$(this).remove()
} else {
$(this).attr("title", text);
$(this).attr('title', text)
}
});
$("i.unparsed").each(function (i, elem) {
var dem = $(this).text();
var dom = $(this);
var start = "./js/emoji/emoji-map.json";
var xmlHttpRequest = new XMLHttpRequest();
xmlHttpRequest.onreadystatechange = function () {
})
$('i.unparsed').each(function(i, elem) {
var dem = $(this).text()
var dom = $(this)
var start = './js/emoji/emoji-map.json'
var xmlHttpRequest = new XMLHttpRequest()
xmlHttpRequest.onreadystatechange = function() {
if (this.readyState === 4 && this.status === 200) {
if (this.response) {
var json = this.response;
var emojis = json.emojis;
var json = this.response
if (this.status !== 200) {
setLog(start, this.status, this.response)
}
var emojis = json.emojis
for (i = 0; i < emojis.length; i++) {
var emojie = emojis[i];
var regExp = new RegExp(dem, "g");
var emojie = emojis[i]
var regExp = new RegExp(dem, 'g')
if (emojie.emoji.match(regExp)) {
var sc = emojie.name;
var sc = "twa-" + sc.replace(/_/g, "-");
dom.addClass(sc);
dom.text("");
dom.removeClass("unparsed");
break;
var sc = emojie.name
var sc = 'twa-' + sc.replace(/_/g, '-')
dom.addClass(sc)
dom.text('')
dom.removeClass('unparsed')
break
}
}
}
}
}
xmlHttpRequest.open('GET', start, true);
xmlHttpRequest.responseType = 'json';
xmlHttpRequest.send(null);
});
xmlHttpRequest.open('GET', start, true)
xmlHttpRequest.responseType = 'json'
xmlHttpRequest.send(null)
})
$("#timeline_" + tlid + " .toot:not(:has(a:not(.add-show,.parsed)))").each(function (i, elem) {
$(this).parent().find(".add-show").hide();
});
$('#timeline_' + tlid + ' .toot:not(:has(a:not(.add-show,.parsed)))').each(function(i, elem) {
$(this)
.parent()
.find('.add-show')
.hide()
})
//Markdownイメージビューワー
$("#timeline_" + tlid + " .toot a:not(.img-parsed):has(img)").each(function (i, elem) {
var ilink = $(this).attr("href");
var id = $(this).parents('.cvo').attr("toot-id");
$(this).attr("href", "#");
$(this).attr("onclick", "imgv('" + id + "','" + i + "')");
$(this).attr("data-type", "image");
$(this).attr("id", id + "-image-" + i);
$(this).attr("data-url", ilink);
$(this).addClass("img-parsed");
});
$('#timeline_' + tlid + ' .toot a:not(.img-parsed):has(img)').each(function(i, elem) {
var ilink = $(this).attr('href')
var id = $(this)
.parents('.cvo')
.attr('toot-id')
$(this).attr('href', `javascript:imgv('${id}','${i}')`)
$(this).attr('data-type', 'image')
$(this).attr('id', id + '-image-' + i)
$(this).attr('data-url', ilink)
$(this).addClass('img-parsed')
})
}
function additionalIndv(tlid, acct_id, id) {
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
var text = $("[toot-id=" + id + "] .toot a").attr('href');
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var text = $('[toot-id=' + id + '] .toot a').attr('href')
var urls = text.match(
/https?:\/\/([-a-zA-Z0-9@.]+)\/media\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/
);
)
if (urls) {
$("[toot-id=" + id + "] .toot a").remove();
$('[toot-id=' + id + '] .toot a').remove()
} else {
if (localStorage.getItem("mode_" + domain) == "misskey") {
var start = "https://" + domain + "/url?url=" + text;
if (localStorage.getItem('mode_' + domain) == 'misskey') {
var start = 'https://' + domain + '/url?url=' + text
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json'
},
//body: JSON.stringify({})
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
if (json.title) {
$("[toot-id=" + id + "] .additional").html(
"<span class=\"gray\">URL" + lang.lang_cards_check + ":<br>Title:" + escapeHTML(json.title) + "<br>" +
escapeHTML(json.description) + "</span>");
$("[toot-id=" + id + "] a:not(.parsed)").addClass("parsed");
$("[toot-id=" + id + "]").addClass("parsed");
}
});
//body: JSON.stringify({})
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
if (json.title) {
$('[toot-id=' + id + '] .additional').html(
`<span class="gray">URL${lang.lang_cards_check}:<br>Title:${escapeHTML(
json.title
)}<br>${escapeHTML(json.description)}</span>`
)
$('[toot-id=' + id + '] a:not(.parsed)').addClass('parsed')
$('[toot-id=' + id + ']').addClass('parsed')
}
})
} else {
var id = $("[toot-id=" + id + "] .toot a").parents('.cvo').attr("toot-id");
var start = "https://" + domain + "/api/v1/statuses/" + id + "/card";
var id = $('[toot-id=' + id + '] .toot a')
.parents('.cvo')
.attr('toot-id')
var start = 'https://' + domain + '/api/v1/statuses/' + id
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
Authorization: 'Bearer ' + at
}
//body: JSON.stringify({})
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
//このリンク鳥やんけ、ってとき
if (json.provider_name == "Twitter") {
if (json.image) {
var twiImg = '<br><img src="' + json.image + '" style="max-width:100%" onclick="imgv(\'twi_' + id + '\', 0, \'twitter\');" id="twi_' + id + '-image-0" data-url="' + json.image + '" data-type="image">';
} else {
var twiImg = '';
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
$("[toot-id=" + id + "] .additional").html(
'<div class="twitter-tweet"><b>' + escapeHTML(json.author_name) + '</b><br>' + escapeHTML(json.description) + twiImg + '</div>');
} else if (json.provider_name == "pixiv") {
if (json.image) {
var pxvImg = '<br><img src="' + json.image + '" style="max-width:100%" onclick="imgv(\'pixiv_' + id + '\', 0, \'pixiv\');" id="pixiv_' + id + '-image-0" data-url="' + json.embed_url + '" data-type="image">';
} else {
var pxvImg = '';
}
$("[toot-id=" + id + "] .additional").html(
'<div class="pixiv-post"><b><a href="' + json.author_url + '" target="_blank">' + escapeHTML(json.author_name) + '</a></b><br>' + escapeHTML(json.title) + pxvImg + '</div>');
} else {
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
cards = json.card
var analyze = cardHtml(cards, acct_id, id)
$('[toot-id=' + id + '] .additional').html(analyze)
if (json.title) {
$("[toot-id=" + id + "] .additional").html(
"<span class=\"gray\">URL" + lang.lang_cards_check + ":<br>Title:" + escapeHTML(json.title) + "<br>" +
escapeHTML(json.description) + "</span>");
$('[toot-id=' + id + '] a:not(.parsed)').addClass('parsed')
$('[toot-id=' + id + ']').addClass('parsed')
}
if (json.html) {
$("[toot-id=" + id + "] .additional").html(json.html + '<i class="material-icons sml pointer" onclick="pip(\'' + id + '\')" title="' + lang.lang_cards_pip + '">picture_in_picture_alt</i>');
}
}
if (json.title) {
$("[toot-id=" + id + "] a:not(.parsed)").addClass("parsed");
$("[toot-id=" + id + "]").addClass("parsed");
}
});
})
}
}
}
function cardHtml(json, acct_id, id) {
var analyze = ''
var domain = json.url.match(/^https?:\/{2,}(.*?)(?:\/|\?|#|$)/)[1];
var ok = [
"pixiv.net",
"twitter.com",
"mobile.twitter.com",
"open.spotify.com",
"youtube.com",
"youtu.be",
"m.youtube.com",
"www.youtube.com",
"nicovideo.jp",
"twitcasting.tv"
]
var isHad = _.includes(ok, domain);
if (json.provider_name == 'pixiv') {
if (json.image) {
var pxvImg = `
<br><img src="${json.image}" style="max-width:100%"
onclick="imgv('pixiv_${id}',0,'pixiv')" id="pixiv_${id}-image-0"
data-url="${json.embed_url}"
data-type="image">
`
} else {
var pxvImg = ''
}
analyze = `<div class="pixiv-post"><b><a href="
${json.author_url}
" target="_blank">
${escapeHTML(json.author_name)}
</a></b><br>
${escapeHTML(json.title)}
${pxvImg}
</div>`
} else {
if (json.title) {
analyze = `<span class="gray">URL
${lang.lang_cards_check}
:<br>Title:
${escapeHTML(json.title)}
<br>
${escapeHTML(json.description)}
</span>`
}
if (json.html || json.provider_name == 'Twitter') {
if(isHad) {
var prved = `<img class="emoji" draggable="false" alt="✅"
src="https://twemoji.maxcdn.com/v/12.1.3/72x72/2705.png">`
var title = lang.lang_cards_trusted
}else{
var prved = '<img class="emoji" draggable="false" alt="⚠️" src="https://twemoji.maxcdn.com/v/12.1.4/72x72/26a0.png">'
var title = lang.lang_cards_untrusted
}
analyze =`<a onclick="cardHtmlShow('${acct_id}','${id}')" class="add-show pointer" title="${title}">
${lang.lang_parse_html}(${domain})${prved}
</a>${analyze}<br>`
}
}
return analyze
}
function cardHtmlShow(acct_id, id) {
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var text = $('[toot-id=' + id + '] .toot a').attr('href')
var urls = text.match(
/https?:\/\/([-a-zA-Z0-9@.]+)\/media\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/
)
var id = $('[toot-id=' + id + '] .toot a')
.parents('.cvo')
.attr('toot-id')
var start = 'https://' + domain + '/api/v1/statuses/' + id
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at
}
//body: JSON.stringify({})
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
json = json.card
if (json.html) {
analyze =
json.html +
`<i class="material-icons sml pointer" onclick="pip('
${id}
')" title="
${lang.lang_cards_pip}
">picture_in_picture_alt</i>`
}
if (json.provider_name == 'Twitter') {
var url = json.author_url
var status = json.url.match(/^https:\/\/twitter.com\/[_a-zA-Z0-9-]+\/status\/([0-9]+)/);
var statusId = false
if(status){
if(status.length > 0){
var statusId = status[1]
}
}
console.log(statusId)
if(statusId){
url = json.url
analyze = `
<blockquote class="twitter-tweet" data-dnt="true"><strong>${json.author_name}</strong><br>${json.description}<a href="${url}">${json.url}</a></blockquote>
<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
`
}
}
$('[toot-id=' + id + '] .additional').html(analyze)
})
}
//各TL上方のLink[On/Off]
function cardToggle(tlid) {
var card = localStorage.getItem("card_" + tlid);
var card = localStorage.getItem('card_' + tlid)
if (!card) {
localStorage.setItem("card_" + tlid, "true");
$("#sta-card-" + tlid).text("Off");
$("#sta-card-" + tlid).css("color", 'red');
localStorage.setItem('card_' + tlid, 'true')
$('#sta-card-' + tlid).text('Off')
$('#sta-card-' + tlid).css('color', 'red')
} else {
localStorage.removeItem("card_" + tlid);
$("#sta-card-" + tlid).text("On");
$("#sta-card-" + tlid).css("color", '#009688');
localStorage.removeItem('card_' + tlid)
$('#sta-card-' + tlid).text('On')
$('#sta-card-' + tlid).css('color', '#009688')
}
}
//各TL上方のLink[On/Off]をチェック
function cardCheck(tlid) {
var card = localStorage.getItem("card_" + tlid);
var card = localStorage.getItem('card_' + tlid)
if (!card) {
$("#sta-card-" + tlid).text("On");
$("#sta-card-" + tlid).css("color", '#009688');
$('#sta-card-' + tlid).text('On')
$('#sta-card-' + tlid).css('color', '#009688')
} else {
$("#sta-card-" + tlid).text("Off");
$("#sta-card-" + tlid).css("color", 'red');
$('#sta-card-' + tlid).text('Off')
$('#sta-card-' + tlid).css('color', 'red')
}
}
function mov(id, tlid, type) {
if (tlid == "notf") {
var tlide = "[data-notf=" + acct_id + "]";
} else if (tlid == "user") {
var tlide = "#his-data";
var click = false
if (tlid == 'notf') {
var tlide = '[data-notf=' + acct_id + ']'
} else if (tlid == 'user') {
var tlide = '#his-data'
} else {
var tlide = "[tlid=" + tlid + "]";
var tlide = '[tlid=' + tlid + ']'
}
var mouseover = localStorage.getItem("mouseover");
var mouseover = localStorage.getItem('mouseover')
if (!mouseover) {
mouseover = "";
mouseover = ''
}
if (mouseover == "yes") {
mouseover = "hide";
} else if (mouseover == "click") {
if (type == "mv") {
mouseover = "";
if (mouseover == 'yes') {
mouseover = 'hide'
} else if (mouseover == 'click') {
if (type == 'mv') {
mouseover = ''
} else {
mouseover = "hide";
mouseover = 'hide'
}
} else if (mouseover == "no") {
mouseover = "";
click = true
} else if (mouseover == 'no') {
mouseover = ''
}
if (mouseover == "hide") {
$(tlide + " [toot-id=" + id + "] .area-actions").toggleClass("hide")
$(tlide + " [toot-id=" + id + "] .area-side").toggleClass("hide")
if (mouseover == 'hide') {
if (click) {
$(tlide + ' [toot-id=' + id + ']').toggleClass('hide-actions')
} else {
$(tlide + ' [toot-id=' + id + ']').removeClass('hide-actions')
}
//$(tlide + " [toot-id=" + id + "] .area-vis").toggleClass("hide")
//$(tlide + " [toot-id=" + id + "] .area-actions").toggleClass("hide")
//$(tlide + " [toot-id=" + id + "] .area-side").toggleClass("hide")
}
}
function resetmv(type) {
var mouseover = localStorage.getItem("mouseover");
var mouseover = localStorage.getItem('mouseover')
if (!mouseover) {
mouseover = "";
} else if (mouseover == "yes") {
mouseover = "hide";
} else if (mouseover == "no") {
mouseover = "";
} else if (mouseover == "click" && type != "mv") {
mouseover = "hide";
mouseover = ''
} else if (mouseover == 'yes') {
mouseover = 'hide'
} else if (mouseover == 'no') {
mouseover = ''
} else if (mouseover == 'click' && type != 'mv') {
mouseover = 'hide'
}
if (mouseover == "hide") {
$(".area-actions").addClass("hide");
$(".area-side").addClass("hide");
if (mouseover == 'hide') {
$('.cvo').addClass('hide-actions')
//$(".area-vis").addClass("hide");
//$(".area-actions").addClass("hide");
//$(".area-side").addClass("hide");
}
}
}

File diff suppressed because it is too large Load Diff

76
app/js/tl/directory.js Normal file
View File

@@ -0,0 +1,76 @@
//ディレクトリ
//ディレクトリトグル
function dirMenu() {
$("#dir-contents").html("");
directory();
$("#left-menu div").removeClass("active");
$("#dirMenu").addClass("active");
$(".menu-content").addClass("hide");
$("#dir-box").removeClass("hide");
}
function dirselCk() {
var acct = $("#dir-acct-sel").val();
if (acct == "noauth") {
$("#dirNoAuth").removeClass("hide");
} else {
$("#dirNoAuth").addClass("hide");
directory();
}
}
function directory(isMore) {
var order = $("[name=sort]:checked").val();
if (!order) {
order = "active";
}
var local_only = $("#local_only:checked").val();
if (local_only) {
local_only = "true";
} else {
local_only = "false";
}
var acct_id = $("#dir-acct-sel").val();
if (acct_id == "noauth") {
var domain = $("#dirNoAuth-url").val();
var at = "";
} else {
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
}
if (isMore) {
var addOffset = $("#dir-contents .cvo").length;
} else {
var addOffset = 0;
$("#dir-contents").html("");
}
var start = "https://" + domain + "/api/v1/directory?order=" + order + "&local=" + local_only + "&offset=" + addOffset;
console.log(start);
fetch(start, {
method: "GET",
headers: {
"content-type": "application/json",
Authorization: "Bearer " + at
}
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text);
});
}
return response.json();
})
.catch(function(error) {
setLog(start, "JSON", error);
console.error(error);
})
.then(function(json) {
if (json) {
$("#moreDir").removeClass("disabled");
var html = userparse(json, null, acct_id, "dir", null);
$("#dir-contents").append(html);
jQuery("time.timeago").timeago();
} else {
$("#moreDir").addClass("disabled");
}
});
}

View File

@@ -1,31 +1,38 @@
//DM(Conv) TL
function dm(acct_id, tlid, type, delc, voice) {
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/v1/conversations";
fetch(start, {
method: 'GET',
method: "GET",
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
var templete = '<div id="convList' + tlid + '">' + dmListParse(json, type, acct_id, tlid, "", mute) + '</div>';
localStorage.setItem("lastobj_" + tlid, json[0].id)
$("#timeline_" + tlid).html(templete);
additional(acct_id, tlid);
jQuery("time.timeago").timeago();
todc();
//reload(type, '', acct_id, tlid, data, mute, delc,voice);
$(window).scrollTop(0);
});
"content-type": "application/json",
Authorization: "Bearer " + at
}
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text);
});
}
return response.json();
})
.catch(function(error) {
todo(error);
setLog(start, "JSON", error);
console.error(error);
})
.then(function(json) {
var templete = '<div id="convList' + tlid + '">' + dmListParse(json, type, acct_id, tlid, "", mute) + "</div>";
localStorage.setItem("lastobj_" + tlid, json[0].id);
$("#timeline_" + tlid).html(templete);
additional(acct_id, tlid);
jQuery("time.timeago").timeago();
todc();
//reload(type, '', acct_id, tlid, data, mute, delc,voice);
$(window).scrollTop(0);
});
}
function dmmore(tlid) {
var multi = localStorage.getItem("column");
@@ -33,39 +40,50 @@ function dmmore(tlid) {
var acct_id = obj[tlid].domain;
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
var sid = $("#timeline_" + tlid + " .cvo").last().attr("unique-id");
var sid = $("#timeline_" + tlid + " .cvo")
.last()
.attr("unique-id");
var start = "https://" + domain + "/api/v1/conversations?max_id=" + sid;
var type = "dm";
fetch(start, {
method: 'GET',
method: "GET",
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
var templete = '<div id="convList' + tlid + '">' + dmListParse(json, type, acct_id, tlid, "", mute) + '</div>';
$("#timeline_" + tlid).append(templete);
additional(acct_id, tlid);
jQuery("time.timeago").timeago();
moreloading = false;
"content-type": "application/json",
Authorization: "Bearer " + at
}
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text);
});
}
return response.json();
})
.catch(function(error) {
todo(error);
setLog(start, "JSON", error);
console.error(error);
})
.then(function(json) {
var templete = '<div id="convList' + tlid + '">' + dmListParse(json, type, acct_id, tlid, "", mute) + "</div>";
$("#timeline_" + tlid).append(templete);
additional(acct_id, tlid);
jQuery("time.timeago").timeago();
moreloading = false;
});
}
//DMオブジェクトパーサー(トゥート)
function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
var templete = '';
var templete = "";
if (obj[0]) {
localStorage.setItem("lastunix_" + tlid, date(obj[0].created_at, 'unix'));
localStorage.setItem("lastunix_" + tlid, date(obj[0].created_at, "unix"));
}
var actb = localStorage.getItem("action_btns");
var actb = 're,rt,fav,qt,del,pin,red';
var actb = "re,rt,fav,qt,del,pin,red";
if (actb) {
var actb = actb.split(',');
var actb = actb.split(",");
var disp = {};
for (var k = 0; k < actb.length; k++) {
if (k < 4) {
@@ -198,7 +216,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
}
var local = [];
var times = [];
Object.keys(obj).forEach(function (key) {
Object.keys(obj).forEach(function(key) {
var conv_id = obj[key].id;
var toot = obj[key].last_status;
var dis_name = escapeHTML(toot.account.display_name);
@@ -209,14 +227,12 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
}
//絵文字があれば
if (actemojick) {
Object.keys(toot.account.emojis).forEach(function (key5) {
Object.keys(toot.account.emojis).forEach(function(key5) {
var emoji = toot.account.emojis[key5];
var shortcode = emoji.shortcode;
var emoji_url = '<img src="' + emoji.url +
'" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
var regExp = new RegExp(":" + shortcode + ":", "g");
dis_name = dis_name.replace(regExp, emoji_url);
});
}
var noticeavatar = "";
@@ -232,7 +248,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
var fullname = toot.account.acct + "@" + domain;
}
if (useremp) {
Object.keys(useremp).forEach(function (key10) {
Object.keys(useremp).forEach(function(key10) {
var user = useremp[key10];
if (user == fullname) {
boostback = "emphasized";
@@ -247,19 +263,19 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
var locked = "";
}
if (!toot.application) {
var via = '';
var via = "";
viashow = "hide";
} else {
var via = escapeHTML(toot.application.name);
//強調チェック
Object.keys(emp).forEach(function (key6) {
Object.keys(emp).forEach(function(key6) {
var cli = emp[key6];
if (cli == via) {
boostback = "emphasized";
}
});
//ミュートチェック
Object.keys(mute).forEach(function (key7) {
Object.keys(mute).forEach(function(key7) {
var cli = mute[key7];
if (cli == via) {
boostback = "hide";
@@ -274,20 +290,20 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
var spoil = escapeHTML(toot.spoiler_text);
var spoiler = "cw cw_hide_" + toot.id;
var api_spoil = "gray";
var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
'\')" class="nex parsed">' + lang.lang_parse_cwshow + '</a><br>';
var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id + '\')" class="nex parsed">' + lang.lang_parse_cwshow + "</a><br>";
} else {
var ct1 = toot.content.split('</p>').length + toot.content.split('<br />').length - 2;
var ct2 = toot.content.split('</p>').length + toot.content.split('<br>').length - 2;
if (ct1 > ct2) { var ct = ct1; } else { var ct = ct2; }
var ct1 = toot.content.split("</p>").length + toot.content.split("<br />").length - 2;
var ct2 = toot.content.split("</p>").length + toot.content.split("<br>").length - 2;
if (ct1 > ct2) {
var ct = ct1;
} else {
var ct = ct2;
}
if ((sent < ct && $.mb_strlen($.strip_tags(toot.content)) > 5) || ($.strip_tags(toot.content).length > ltr && $.mb_strlen($.strip_tags(toot.content)) > 5)) {
var content = '<span class="gray">' + lang.lang_parse_fulltext + '</span><br>' + toot.content
var spoil = '<span class="cw-long-' + toot.id + '">' + $.mb_substr($.strip_tags(
toot.content), 0, 100) +
'</span><span class="gray">' + lang.lang_parse_autofold + '</span>';
var content = '<span class="gray">' + lang.lang_parse_fulltext + "</span><br>" + toot.content;
var spoil = '<span class="cw-long-' + toot.id + '">' + $.mb_substr($.strip_tags(toot.content), 0, 100) + '</span><span class="gray">' + lang.lang_parse_autofold + "</span>";
var spoiler = "cw cw_hide_" + toot.id;
var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
'\')" class="nex parsed">' + lang.lang_parse_more + '</a><br>';
var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id + '\')" class="nex parsed">' + lang.lang_parse_more + "</a><br>";
} else {
var content = toot.content;
var spoil = escapeHTML(toot.spoiler_text);
@@ -295,14 +311,13 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
var spoiler_show = "";
}
}
var urls = $.strip_tags(content).replace(/\n/g, " ").match(
/https?:\/\/([-a-zA-Z0-9@.]+)\/?(?!.*((media|tags)|mentions)).*([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)?/
);
var urls = $.strip_tags(content)
.replace(/\n/g, " ")
.match(/https?:\/\/([-a-zA-Z0-9@.]+)\/?(?!.*((media|tags)|mentions)).*([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)?/);
if (urls) {
var analyze = '<a onclick="additionalIndv(\'' + tlid + '\',' + acct_id +
',\'' + id + '\')" class="add-show pointer">' + lang.lang_parse_url + '</a><br>';
var analyze = "<a onclick=\"additionalIndv('" + tlid + "'," + acct_id + ",'" + id + '\')" class="add-show pointer">' + lang.lang_parse_url + "</a><br>";
} else {
var analyze = '';
var analyze = "";
}
var viewer = "";
var hasmedia = "";
@@ -314,11 +329,10 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
}
//絵文字があれば
if (emojick) {
Object.keys(toot.emojis).forEach(function (key5) {
Object.keys(toot.emojis).forEach(function(key5) {
var emoji = toot.emojis[key5];
var shortcode = emoji.shortcode;
var emoji_url = '<img src="' + emoji.url +
'" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
var regExp = new RegExp(":" + shortcode + ":", "g");
content = content.replace(regExp, emoji_url);
spoil = spoil.replace(regExp, emoji_url);
@@ -332,11 +346,10 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
}
//絵文字があれば
if (nicoemojick) {
Object.keys(toot.profile_emojis).forEach(function (keynico) {
Object.keys(toot.profile_emojis).forEach(function(keynico) {
var emoji = toot.profile_emojis[keynico];
var shortcode = emoji.shortcode;
var emoji_url = '<img src="' + emoji.url +
'" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
var regExp = new RegExp(":" + shortcode + ":", "g");
content = content.replace(regExp, emoji_url);
spoil = spoil.replace(regExp, emoji_url);
@@ -356,21 +369,17 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
if (mediack) {
hasmedia = "hasmedia";
var cwdt = 100 / toot.media_attachments.length;
Object.keys(toot.media_attachments).forEach(function (key2) {
Object.keys(toot.media_attachments).forEach(function(key2) {
var media = toot.media_attachments[key2];
var purl = media.preview_url;
media_ids = media_ids + media.id + ",";
var url = media.url;
if (toot.sensitive && nsfw) {
var sense = "sensitive"
var sense = "sensitive";
} else {
var sense = ""
var sense = "";
}
viewer = viewer + '<a onclick="imgv(\'' + id + '\',\'' + key2 + '\',\'' +
acct_id + '\')" id="' + id + '-image-' + key2 + '" data-url="' + url +
'" data-type="' + media.type + '" class="img-parsed"><img src="' +
purl + '" class="' + sense +
' toot-img pointer" style="width:' + cwdt + '%; height:' + imh + 'px;"></a></span>';
viewer = viewer + "<a onclick=\"imgv('" + id + "','" + key2 + "','" + acct_id + '\')" id="' + id + "-image-" + key2 + '" data-url="' + url + '" data-type="' + media.type + '" class="img-parsed"><img src="' + purl + '" class="' + sense + ' toot-img pointer" style="width:' + cwdt + "%; height:" + imh + 'px;"></a></span>';
});
media_ids = media_ids.slice(0, -1);
} else {
@@ -382,24 +391,21 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
//メンションであれば
if (menck) {
mentions = "";
Object.keys(toot.mentions).forEach(function (key3) {
Object.keys(toot.mentions).forEach(function(key3) {
var mention = toot.mentions[key3];
mentions = mentions + '<a onclick="udg(\'' + mention.id + '\',' +
acct_id + ')" class="pointer">@' + mention.acct + '</a> ';
mentions = mentions + "<a onclick=\"udg('" + mention.id + "'," + acct_id + ')" class="pointer">@' + mention.acct + "</a> ";
});
mentions = '<div style="float:right">' + mentions + '</div>';
mentions = '<div style="float:right">' + mentions + "</div>";
}
var tagck = toot.tags[0];
var tags = "";
//タグであれば
if (tagck) {
Object.keys(toot.tags).forEach(function (key4) {
Object.keys(toot.tags).forEach(function(key4) {
var tag = toot.tags[key4];
tags = tags + '<span class="hide" data-tag="' + tag.name + '">#' + tag.name + ':<a onclick="tl(\'tag\',\'' + tag.name + '\',' + acct_id +
',\'add\')" class="pointer" title="' + lang.lang_parse_tagTL.replace("{{tag}}", '#' + tag.name) + '">TL</a> <a onclick="brInsert(\'#' + tag.name + '\')" class="pointer" title="' + lang.lang_parse_tagtoot.replace("{{tag}}", '#' + tag.name) + '">Toot</a> ' +
'<a onclick="tagPin(\'' + tag.name + '\')" class="pointer" title="' + lang.lang_parse_tagpin.replace("{{tag}}", '#' + tag.name) + '">Pin</a></span> ';
tags = tags + '<span class="hide" data-tag="' + tag.name + '">#' + tag.name + ":<a onclick=\"tl('tag','" + tag.name + "'," + acct_id + ',\'add\')" class="pointer" title="' + lang.lang_parse_tagTL.replace("{{tag}}", "#" + tag.name) + '">TL</a> <a onclick="brInsert(\'#' + tag.name + '\')" class="pointer" title="' + lang.lang_parse_tagtoot.replace("{{tag}}", "#" + tag.name) + '">Toot</a> ' + "<a onclick=\"tagPin('" + tag.name + '\')" class="pointer" title="' + lang.lang_parse_tagpin.replace("{{tag}}", "#" + tag.name) + '">Pin</a></span> ';
});
tags = '<div style="float:right">' + tags + '</div>';
tags = '<div style="float:right">' + tags + "</div>";
}
//アニメ再生
if (gif == "yes") {
@@ -409,13 +415,13 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
}
//ワードミュート
if (wordmute) {
Object.keys(wordmute).forEach(function (key8) {
Object.keys(wordmute).forEach(function(key8) {
var worde = wordmute[key8];
if (worde) {
if (worde.tag) {
var word = worde.tag;
} else {
var word = worde
var word = worde;
}
var regExp = new RegExp(word, "g");
if ($.strip_tags(content).match(regExp)) {
@@ -426,7 +432,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
}
//ワード強調
if (wordemp) {
Object.keys(wordemp).forEach(function (key9) {
Object.keys(wordemp).forEach(function(key9) {
var word = wordemp[key9];
if (word) {
var word = word.tag;
@@ -455,23 +461,21 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
if (cards.image) {
var twiImg = '<br><img src="' + cards.image + '">';
} else {
var twiImg = '';
var twiImg = "";
}
analyze = '<blockquote class="twitter-tweet"><b>' + escapeHTML(cards.author_name) + '</b><br>' + escapeHTML(cards.description) + twiImg + '</blockquote>';
analyze = '<blockquote class="twitter-tweet"><b>' + escapeHTML(cards.author_name) + "</b><br>" + escapeHTML(cards.description) + twiImg + "</blockquote>";
}
if (cards.title) {
analyze = "<span class=\"gray\">URL" + lang.lang_cards_check + ":<br>Title:" + escapeHTML(cards.title) + "<br>" +
escapeHTML(cards.description) + "</span>";
analyze = '<span class="gray">URL' + lang.lang_cards_check + ":<br>Title:" + escapeHTML(cards.title) + "<br>" + escapeHTML(cards.description) + "</span>";
}
if (cards.html) {
analyze = cards.html + '<i class="material-icons" onclick="pip(' + id + ')" title="' + lang.lang_cards_pip + '">picture_in_picture_alt</i>';
}
}
//Ticker
var tickerdom = "";
if (ticker) {
var tickerdata = localStorage.getItem("ticker")
var tickerdata = localStorage.getItem("ticker");
if (tickerdata) {
var tickerdata = JSON.parse(tickerdata);
@@ -482,41 +486,13 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
for (var i = 0; i < tickerdata.length; i++) {
var value = tickerdata[i];
if (value.domain == thisdomain) {
var tickerdom = '<div style="background:linear-gradient(to left,transparent, ' + value.bg + ' 96%) !important; color:' + value.text + ';width:100%; height:0.9rem; font-size:0.8rem;"><img src="' + value.image + '" style="height:100%;"><span style="position:relative; top:-0.2rem;"> ' + escapeHTML(value.name) + '</span></div>';
var tickerdom = '<div style="background:linear-gradient(to left,transparent, ' + value.bg + " 96%) !important; color:" + value.text + ';width:100%; height:0.9rem; font-size:0.8rem;"><img src="' + value.image + '" style="height:100%;"><span style="position:relative; top:-0.2rem;"> ' + escapeHTML(value.name) + "</span></div>";
break;
}
}
}
}
templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' +
boostback + ' ' + fav_app +
' ' + hasmedia + '" toot-id="' + id + '" unique-id="' + uniqueid + '" data-medias="' + media_ids + ' " unixtime="' + date(obj[
key].created_at, 'unix') + '" ' + if_notf + ' onclick="dmStatus()">' +
'<div class="area-notice"><span class="gray sharesta">' + notice + home +
'</span></div>' +
'<div class="area-icon"><a onclick="udg(\'' + toot.account.id +
'\',' + acct_id + ');" user="' + toot.account.acct + '" class="udg">' +
'<img src="' + avatar +
'" width="40" class="prof-img" user="' + toot.account.acct +
'"></a>' + noticeavatar + '</div>' +
'<div class="area-display_name"><div class="flex-name"><span class="user">' +
dis_name +
'</span><span class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis; cursor:text;"> @' +
toot.account.acct + locked + '</span></div>' +
'<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'' +
toot.url + '\');" title="' + date(toot.created_at, 'absolute') +
'(' + lang.lang_parse_clickcopyurl + ')"><i class="far fa-clock-o"></i>' +
date(toot.created_at, datetype) + '</span>' +
'</div></div>' +
'<div class="area-toot">' + tickerdom + '<span class="' +
api_spoil + ' cw_text_' + toot.id + '"><span class="cw_text">' + spoil + "</span>" + spoiler_show +
'</span><span class="toot ' + spoiler + '">' + content +
'</span>' +
'' + viewer + '' +
'<br><a onclick="details(\'' + toot.id + '\',' + acct_id +
',\'' + tlid + '\',\'dm\')" class="pointer waves-effect">' + lang.lang_parse_thread + '</a></div>' +
'<div class="area-vis"></div>' +
'</div></div>';
templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' + boostback + " " + fav_app + " " + hasmedia + '" toot-id="' + id + '" unique-id="' + uniqueid + '" data-medias="' + media_ids + ' " unixtime="' + date(obj[key].created_at, "unix") + '" ' + if_notf + ' onclick="dmStatus()">' + '<div class="area-notice"><span class="gray sharesta">' + notice + home + "</span></div>" + '<div class="area-icon"><a onclick="udg(\'' + toot.account.id + "'," + acct_id + ');" user="' + toot.account.acct + '" class="udg">' + '<img src="' + avatar + '" width="40" class="prof-img" user="' + toot.account.acct + '"></a>' + noticeavatar + "</div>" + '<div class="area-display_name"><div class="flex-name"><span class="user">' + dis_name + '</span><span class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis; cursor:text;"> @' + toot.account.acct + locked + "</span></div>" + '<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'' + toot.url + '\');" title="' + date(toot.created_at, "absolute") + "(" + lang.lang_parse_clickcopyurl + ')"><i class="far fa-clock-o"></i>' + date(toot.created_at, datetype) + "</span>" + "</div></div>" + '<div class="area-toot">' + tickerdom + '<span class="' + api_spoil + " cw_text_" + toot.id + '"><span class="cw_text">' + spoil + "</span>" + spoiler_show + '</span><span class="toot ' + spoiler + '">' + content + "</span>" + "" + viewer + "" + "<br><a onclick=\"details('" + toot.id + "'," + acct_id + ",'" + tlid + "','dm')\" class=\"pointer waves-effect\">" + lang.lang_parse_thread + "</a></div>" + '<div class="area-vis"></div>' + "</div></div>";
});
return templete;
}

View File

@@ -1,381 +1,447 @@
/*メディアフィルター機能*/
//各TL上方のMedia[On/Off]
function mediaToggle(tlid) {
var media = localStorage.getItem("media_" + tlid);
var media = localStorage.getItem('media_' + tlid)
if (media) {
localStorage.removeItem("media_" + tlid);
$("#sta-media-" + tlid).text("Off");
$("#sta-media-" + tlid).css("color", 'red');
$("#timeline_" + tlid).removeClass("media-filter")
localStorage.removeItem('media_' + tlid)
$('#sta-media-' + tlid).text('Off')
$('#sta-media-' + tlid).css('color', 'red')
$('#timeline_' + tlid).removeClass('media-filter')
} else {
localStorage.setItem("media_" + tlid, "true");
$("#sta-media-" + tlid).text("On");
$("#sta-media-" + tlid).css("color", '#009688');
$("#timeline_" + tlid).addClass("media-filter")
localStorage.setItem('media_' + tlid, 'true')
$('#sta-media-' + tlid).text('On')
$('#sta-media-' + tlid).css('color', '#009688')
$('#timeline_' + tlid).addClass('media-filter')
}
}
//各TL上方のBT[BTOnly/BTExc/Off]
function ebtToggle(tlid) {
var ebt = localStorage.getItem("ebt_" + tlid);
if (ebt == "true") {
localStorage.setItem("ebt_" + tlid, "but");
$("#sta-bt-" + tlid).text("BT Only");
$("#sta-bt-" + tlid).css("color", '#ff9800');
$("#timeline_" + tlid).addClass("except-bt-filter")
$("#timeline_" + tlid).removeClass("bt-filter")
} else if (ebt == "but") {
localStorage.removeItem("ebt_" + tlid);
$("#sta-bt-" + tlid).text("Off");
$("#sta-bt-" + tlid).css("color", 'red');
$("#timeline_" + tlid).removeClass("bt-filter")
$("#timeline_" + tlid).removeClass("except-bt-filter")
var ebt = localStorage.getItem('ebt_' + tlid)
if (ebt == 'true') {
localStorage.setItem('ebt_' + tlid, 'but')
$('#sta-bt-' + tlid).text('BT Only')
$('#sta-bt-' + tlid).css('color', '#ff9800')
$('#timeline_' + tlid).addClass('except-bt-filter')
$('#timeline_' + tlid).removeClass('bt-filter')
} else if (ebt == 'but') {
localStorage.removeItem('ebt_' + tlid)
$('#sta-bt-' + tlid).text('Off')
$('#sta-bt-' + tlid).css('color', 'red')
$('#timeline_' + tlid).removeClass('bt-filter')
$('#timeline_' + tlid).removeClass('except-bt-filter')
} else {
localStorage.setItem("ebt_" + tlid, "true");
$("#sta-bt-" + tlid).text("BT Ex");
$("#sta-bt-" + tlid).css("color", '#009688');
$("#timeline_" + tlid).addClass("bt-filter")
$("#timeline_" + tlid).removeClass("except-bt-filter")
localStorage.setItem('ebt_' + tlid, 'true')
$('#sta-bt-' + tlid).text('BT Ex')
$('#sta-bt-' + tlid).css('color', '#009688')
$('#timeline_' + tlid).addClass('bt-filter')
$('#timeline_' + tlid).removeClass('except-bt-filter')
}
}
//各TL上方のMedia[On/Off]をチェック
function mediaCheck(tlid) {
var media = localStorage.getItem("media_" + tlid);
var media = localStorage.getItem('media_' + tlid)
if (media) {
$("#sta-media-" + tlid).text("On");
$("#sta-media-" + tlid).css("color", '#009688');
$("#timeline_" + tlid).addClass("media-filter")
$('#sta-media-' + tlid).text('On')
$('#sta-media-' + tlid).css('color', '#009688')
$('#timeline_' + tlid).addClass('media-filter')
} else {
$("#sta-media-" + tlid).text("Off");
$("#sta-media-" + tlid).css("color", 'red');
$("#timeline_" + tlid).removeClass("media-filter")
$('#sta-media-' + tlid).text('Off')
$('#sta-media-' + tlid).css('color', 'red')
$('#timeline_' + tlid).removeClass('media-filter')
}
}
//各TL上方のBT[On/Off]をチェック
function ebtCheck(tlid) {
var ebt = localStorage.getItem("ebt_" + tlid);
if (ebt == "true") {
$("#sta-bt-" + tlid).text("BT Ex");
$("#sta-bt-" + tlid).css("color", '#009688');
$("#timeline_" + tlid).addClass("bt-filter")
$("#timeline_" + tlid).removeClass("except-bt-filter")
} else if (ebt == "but") {
$("#sta-bt-" + tlid).text("BT Only");
$("#sta-bt-" + tlid).css("color", '#ff9800');
$("#timeline_" + tlid).addClass("except-bt-filter")
$("#timeline_" + tlid).removeClass("bt-filter")
var ebt = localStorage.getItem('ebt_' + tlid)
if (ebt == 'true') {
$('#sta-bt-' + tlid).text('BT Ex')
$('#sta-bt-' + tlid).css('color', '#009688')
$('#timeline_' + tlid).addClass('bt-filter')
$('#timeline_' + tlid).removeClass('except-bt-filter')
} else if (ebt == 'but') {
$('#sta-bt-' + tlid).text('BT Only')
$('#sta-bt-' + tlid).css('color', '#ff9800')
$('#timeline_' + tlid).addClass('except-bt-filter')
$('#timeline_' + tlid).removeClass('bt-filter')
} else {
$("#sta-bt-" + tlid).text("Off");
$("#sta-bt-" + tlid).css("color", 'red');
$("#timeline_" + tlid).removeClass("bt-filter")
$("#timeline_" + tlid).removeClass("except-bt-filter")
$('#sta-bt-' + tlid).text('Off')
$('#sta-bt-' + tlid).css('color', 'red')
$('#timeline_' + tlid).removeClass('bt-filter')
$('#timeline_' + tlid).removeClass('except-bt-filter')
}
}
/* 削除追跡*/
function catchToggle(tlid) {
var catchck = localStorage.getItem("catch_" + tlid);
var catchck = localStorage.getItem('catch_' + tlid)
if (catchck) {
localStorage.removeItem("catch_" + tlid);
$("#sta-del-" + tlid).text("Off");
$("#sta-del-" + tlid).css("color", 'red');
parseColumn();
localStorage.removeItem('catch_' + tlid)
$('#sta-del-' + tlid).text('Off')
$('#sta-del-' + tlid).css('color', 'red')
parseColumn(tlid)
} else {
localStorage.setItem("catch_" + tlid, "true");
$("#sta-del-" + tlid).text("On");
$("#sta-del-" + tlid).css("color", '#009688');
parseColumn();
localStorage.setItem('catch_' + tlid, 'true')
$('#sta-del-' + tlid).text('On')
$('#sta-del-' + tlid).css('color', '#009688')
parseColumn(tlid)
}
}
function catchCheck(tlid) {
var catchck = localStorage.getItem("catch_" + tlid);
var catchck = localStorage.getItem('catch_' + tlid)
if (catchck) {
$("#sta-del-" + tlid).text("On");
$("#sta-del-" + tlid).css("color", '#009688');
$('#sta-del-' + tlid).text('On')
$('#sta-del-' + tlid).css('color', '#009688')
} else {
$("#sta-del-" + tlid).text("Off");
$("#sta-del-" + tlid).css("color", 'red');
$('#sta-del-' + tlid).text('Off')
$('#sta-del-' + tlid).css('color', 'red')
}
}
function delreset(tlid) {
$("[tlid=" + tlid + "] .by_delcatch").hide();
$("[tlid=" + tlid + "] .by_delcatch").remove();
$('[tlid=' + tlid + '] .by_delcatch').hide()
$('[tlid=' + tlid + '] .by_delcatch').remove()
}
/*ワードフィルター機能*/
function filterMenu() {
$("#left-menu div").removeClass("active");
$("#filterMenu").addClass("active");
$(".menu-content").addClass("hide");
$("#filter-box").removeClass("hide");
$('#left-menu div').removeClass('active')
$('#filterMenu').addClass('active')
$('.menu-content').addClass('hide')
$('#filter-box').removeClass('hide')
}
function filter() {
$("#filtered-words").html("");
$("#filter-edit-id").val("")
var acct_id = $("#filter-acct-sel").val();
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/v1/filters"
$('#filtered-words').html('')
$('#filter-edit-id').val('')
var acct_id = $('#filter-acct-sel').val()
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/v1/filters'
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
if (json) {
var filters = "";
Object.keys(json).forEach(function (key) {
var filterword = json[key];
var context = filterword.context.join(',');
filters = filters + escapeHTML(filterword.phrase) + '<span class="sml">(for ' + context + ')</span>:<a onclick="filterEdit(\'' + filterword.id + '\',\'' + acct_id +
'\')" class="pointer">' + lang.lang_edit + '</a>/<a onclick="filterDel(' + filterword.id + ',' + acct_id +
')" class="pointer">' + lang.lang_del + '</a><br> ';
});
if (filters == "") {
filters = lang.lang_filter_nodata + "<br>";
}
$("#filtered-words").html(filters);
} else {
$("#filtered-words").html(lang_filter_nodata);
Authorization: 'Bearer ' + at
}
});
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
if (json) {
var filters = ''
Object.keys(json).forEach(function(key) {
var filterword = json[key]
var context = filterword.context.join(',')
filters =
filters +
escapeHTML(filterword.phrase) +
`<span class="sml">(for ${context})</span>:
<a onclick="filterEdit('${filterword.id}','${acct_id}')" class="pointer">
${lang.lang_edit}
</a>/
<a onclick="filterDel('${filterword.id}','${acct_id}')" class="pointer">
${lang.lang_del}
</a><br> `
})
if (filters == '') {
filters = lang.lang_filter_nodata + '<br>'
}
$('#filtered-words').html(filters)
} else {
$('#filtered-words').html(lang_filter_nodata)
}
})
}
function filterTime(day, hour, min) {
$("#days_filter").val(day)
$("#hours_filter").val(hour)
$("#mins_filter").val(min)
$('#days_filter').val(day)
$('#hours_filter').val(hour)
$('#mins_filter').val(min)
}
function makeNewFilter() {
var acct_id = $("#filter-acct-sel").val();
var phr = $("#filter-add-word").val();
var cont = [];
if ($("#home_filter:checked").val()) {
cont.push("home");
var acct_id = $('#filter-acct-sel').val()
var phr = $('#filter-add-word').val()
var cont = []
if ($('#home_filter:checked').val()) {
cont.push('home')
}
if ($("#local_filter:checked").val()) {
cont.push("public");
if ($('#local_filter:checked').val()) {
cont.push('public')
}
if ($("#notf_filter:checked").val()) {
cont.push("notifications");
if ($('#notf_filter:checked').val()) {
cont.push('notifications')
}
if ($("#conv_filter:checked").val()) {
cont.push("thread");
if ($('#conv_filter:checked').val()) {
cont.push('thread')
}
if (!cont.length) {
$("#filtered-words").html('Error:' + lang.lang_filter_errordegree);
$('#filtered-words').html('Error:' + lang.lang_filter_errordegree)
}
var exc = $("#except_filter:checked").val();
var who = $("#wholeword_filter:checked").val();
var exc = $('#except_filter:checked').val()
var who = $('#wholeword_filter:checked').val()
if (!who) {
who = false;
who = false
}
var time = $("#days_filter").val() * 24 * 60 * 60 + $("#hours_filter").val() * 60 * 60 + $("#mins_filter").val() * 60;
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
if ($("#filter-edit-id").val()) {
var start = "https://" + domain + "/api/v1/filters/" + $("#filter-edit-id").val();
var method = "PUT"
var time =
$('#days_filter').val() * 24 * 60 * 60 +
$('#hours_filter').val() * 60 * 60 +
$('#mins_filter').val() * 60
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
if ($('#filter-edit-id').val()) {
var start = 'https://' + domain + '/api/v1/filters/' + $('#filter-edit-id').val()
var method = 'PUT'
} else {
var start = "https://" + domain + "/api/v1/filters"
var method = "POST"
var start = 'https://' + domain + '/api/v1/filters'
var method = 'POST'
}
var httpreq = new XMLHttpRequest();
httpreq.open(method, start, true);
httpreq.setRequestHeader('Content-Type', 'application/json');
httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
httpreq.responseType = "json";
httpreq.send(JSON.stringify({
phrase: phr,
context: cont,
irreversible: exc,
whole_word: who,
expires_in: time
}));
httpreq.onreadystatechange = function () {
var httpreq = new XMLHttpRequest()
httpreq.open(method, start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json'
httpreq.send(
JSON.stringify({
phrase: phr,
context: cont,
irreversible: exc,
whole_word: who,
expires_in: time
})
)
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
var json = httpreq.response;
filter();
var json = httpreq.response
if (this.status !== 200) {
setLog(start, this.status, this.response)
}
filter()
filterUpdate(acct_id)
$("#filter-add-word").val("");
$("#home_filter").prop("checked", false);
$("#local_filter").prop("checked", false);
$("#notf_filter").prop("checked", false);
$("#conv_filter").prop("checked", false);
$("#except_filter").prop("checked", false);
$("#wholeword_filter").prop("checked", false);
$("#days_filter").val("0");
$("#hours_filter").val("0");
$("#mins_filter").val("0");
$("#add-filter-btn").text(lang.lang_add);
$("#filter-edit-id").val("")
$('#filter-add-word').val('')
$('#home_filter').prop('checked', false)
$('#local_filter').prop('checked', false)
$('#notf_filter').prop('checked', false)
$('#conv_filter').prop('checked', false)
$('#except_filter').prop('checked', false)
$('#wholeword_filter').prop('checked', false)
$('#days_filter').val('0')
$('#hours_filter').val('0')
$('#mins_filter').val('0')
$('#add-filter-btn').text(lang.lang_add)
$('#filter-edit-id').val('')
}
}
}
function filterEdit(id, acct_id) {
$("#filter-add-word").val("");
$("#home_filter").prop("checked", false);
$("#local_filter").prop("checked", false);
$("#notf_filter").prop("checked", false);
$("#conv_filter").prop("checked", false);
$("#except_filter").prop("checked", false);
$("#wholeword_filter").prop("checked", false);
$("#days_filter").val("0");
$("#hours_filter").val("0");
$("#mins_filter").val("0");
$("#add-filter-btn").text(lang.lang_edit);
$("#filter-edit-id").val(id);
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/v1/filters/" + id
$('#filter-add-word').val('')
$('#home_filter').prop('checked', false)
$('#local_filter').prop('checked', false)
$('#notf_filter').prop('checked', false)
$('#conv_filter').prop('checked', false)
$('#except_filter').prop('checked', false)
$('#wholeword_filter').prop('checked', false)
$('#days_filter').val('0')
$('#hours_filter').val('0')
$('#mins_filter').val('0')
$('#add-filter-btn').text(lang.lang_edit)
$('#filter-edit-id').val(id)
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/v1/filters/' + id
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
if (json) {
var now = new Date();
now = now.getTime();
var now = Math.floor(now / 1000);
$("#filter-add-word").val(json.phrase);
Object.keys(json.context).forEach(function (key) {
var context = json.context[key];
$("[value=" + context + "]").prop("checked", true);
});
if (json.irreversible) {
$("#except_filter").prop("checked", true);
}
if (json.whole_word) {
$("#wholeword_filter").prop("checked", true);
}
var expires = date(json.expires_at, 'unix') - now;
var mins = Math.floor(expires / 60) % 60;
var hours = Math.floor(expires / 3600) % 24;
var days = Math.floor(expires / 3600 / 24);
$("#days_filter").val(days);
$("#hours_filter").val(hours);
$("#mins_filter").val(mins);
Authorization: 'Bearer ' + at
}
});
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
if (json) {
var now = new Date()
now = now.getTime()
var now = Math.floor(now / 1000)
$('#filter-add-word').val(json.phrase)
Object.keys(json.context).forEach(function(key) {
var context = json.context[key]
$('[value=' + context + ']').prop('checked', true)
})
if (json.irreversible) {
$('#except_filter').prop('checked', true)
}
if (json.whole_word) {
$('#wholeword_filter').prop('checked', true)
}
var expires = date(json.expires_at, 'unix') - now
var mins = Math.floor(expires / 60) % 60
var hours = Math.floor(expires / 3600) % 24
var days = Math.floor(expires / 3600 / 24)
$('#days_filter').val(days)
$('#hours_filter').val(hours)
$('#mins_filter').val(mins)
}
})
}
function filterDel(id, acct_id) {
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/v1/filters/" + id;
var httpreq = new XMLHttpRequest();
httpreq.open("DELETE", start, true);
httpreq.setRequestHeader('Content-Type', 'application/json');
httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
httpreq.responseType = "json";
httpreq.send();
httpreq.onreadystatechange = function () {
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/v1/filters/' + id
var httpreq = new XMLHttpRequest()
httpreq.open('DELETE', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json'
httpreq.send()
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
var json = httpreq.response;
filter();
var json = httpreq.response
if (this.status !== 200) {
setLog(start, this.status, this.response)
}
filter()
filterUpdate(acct_id)
}
}
}
function getFilter(acct_id) {
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
if (localStorage.getItem("mode_" + domain) != "misskey") {
var start = "https://" + domain + "/api/v1/filters"
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
if (localStorage.getItem('mode_' + domain) != 'misskey') {
var start = 'https://' + domain + '/api/v1/filters'
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
localStorage.setItem("filter_" + acct_id, JSON.stringify(json));
});
Authorization: 'Bearer ' + at
}
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
localStorage.setItem('filter_' + acct_id, JSON.stringify(json))
})
} else {
localStorage.setItem("filter_" + acct_id, JSON.stringify({}));
localStorage.setItem('filter_' + acct_id, JSON.stringify({}))
}
}
function getFilterType(json, type) {
if (!json) {
return [];
return []
}
if (type == "local") {
type = "public";
} else if (type == "list") {
type = "home";
} else if (type == "notf") {
type = "notifi";
if (type == 'local') {
type = 'public'
} else if (type == 'list') {
type = 'home'
} else if (type == 'notf') {
type = 'notifi'
}
var mutedfilters = [];
Object.keys(json).forEach(function (key) {
var filterword = json[key];
var phrases = filterword.phrase;
if (filterword.context.join(",").indexOf(type) !== -1) {
mutedfilters.push(phrases);
var mutedfilters = []
Object.keys(json).forEach(function(key) {
var filterword = json[key]
var phrases = filterword.phrase
var arr = filterword.context
if (arr.join(',').indexOf(type) !== -1) {
mutedfilters.push(phrases)
} else if (type == 'mix'){
if (arr.indexOf('home') !== -1 || arr.indexOf('public') !== -1) {
mutedfilters.push(phrases)
}
}
});
return mutedfilters;
})
return mutedfilters
}
function getFilterTypeByAcct(acct_id, type) {
if (localStorage.getItem('filter_' + acct_id) != 'undefined') {
var mute = getFilterType(JSON.parse(localStorage.getItem('filter_' + acct_id)), type)
} else {
var mute = []
}
return mute
}
function filterUpdate(acct_id) {
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/v1/filters"
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/v1/filters'
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
localStorage.setItem("filter_" + acct_id, JSON.stringify(json));
filterUpdateInternal(json, "home");
filterUpdateInternal(json, "local");
filterUpdateInternal(json, "notf");
filterUpdateInternal(json, "pub");
});
Authorization: 'Bearer ' + at
}
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
localStorage.setItem('filter_' + acct_id, JSON.stringify(json))
filterUpdateInternal(json, 'home')
filterUpdateInternal(json, 'local')
filterUpdateInternal(json, 'notf')
filterUpdateInternal(json, 'pub')
})
}
function filterUpdateInternal(json, type) {
var home = getFilterType(json, type);
var wordmute = localStorage.getItem("word_mute");
var home = getFilterType(json, type)
var wordmute = localStorage.getItem('word_mute')
if (wordmute) {
var wordmute = JSON.parse(wordmute);
home = home.concat(wordmute);
var wordmute = JSON.parse(wordmute)
home = home.concat(wordmute)
}
if (home) {
$("[data-acct=" + acct_id + "] [data-type=" + type + "] .cvo").each(function (i, elem) {
var id = $(elem).attr("toot-id");
$("[toot-id=" + id + "]").removeClass("hide");
var text = $(elem).find('.toot').html();
Object.keys(home).forEach(function (key8) {
var word = home[key8];
var regExp = new RegExp(word.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
$('[data-acct=' + acct_id + '] [data-type=' + type + '] .cvo').each(function(i, elem) {
var id = $(elem).attr('toot-id')
$('[toot-id=' + id + ']').removeClass('hide')
var text = $(elem)
.find('.toot')
.html()
Object.keys(home).forEach(function(key8) {
var word = home[key8]
var regExp = new RegExp(word.replace(/[.*+?^=!:${}()|[\]\/\\]/g, '\\$&'), 'g')
if ($.strip_tags(text).match(regExp)) {
$("[toot-id=" + id + "]").addClass("hide");
$('[toot-id=' + id + ']').addClass('hide')
}
});
});
})
})
}
}
/*
@@ -386,73 +452,73 @@ function filterUpdateInternal(json, type) {
*/
//通知フィルター
function exclude(key) {
localStorage.setItem("exclude-" + key, "")
var excludetxt = localStorage.getItem("exclude-" + key);
localStorage.setItem('exclude-' + key, '')
var excludetxt = localStorage.getItem('exclude-' + key)
if ($('#exc-reply-' + key + ':checked').val()) {
excludetxt = "?exclude_types[]=mention"
excludetxt = '?exclude_types[]=mention'
}
if ($('#exc-fav-' + key + ':checked').val()) {
if (excludetxt || excludetxt !="") {
excludetxt = excludetxt + "&exclude_types[]=favourite"
if (excludetxt || excludetxt != '') {
excludetxt = excludetxt + '&exclude_types[]=favourite'
} else {
excludetxt = "?exclude_types[]=favourite"
excludetxt = '?exclude_types[]=favourite'
}
}
if ($('#exc-bt-' + key + ':checked').val()) {
if (excludetxt || excludetxt !="") {
excludetxt = excludetxt + "&exclude_types[]=reblog"
if (excludetxt || excludetxt != '') {
excludetxt = excludetxt + '&exclude_types[]=reblog'
} else {
excludetxt = "?exclude_types[]=reblog"
excludetxt = '?exclude_types[]=reblog'
}
}
if ($('#exc-follow-' + key + ':checked').val()) {
if (excludetxt || excludetxt !="") {
excludetxt = excludetxt + "&exclude_types[]=follow"
if (excludetxt || excludetxt != '') {
excludetxt = excludetxt + '&exclude_types[]=follow'
} else {
excludetxt = "?exclude_types[]=follow"
excludetxt = '?exclude_types[]=follow'
}
}
if ($('#exc-poll-' + key + ':checked').val()) {
if (excludetxt || excludetxt !="") {
excludetxt = excludetxt + "&exclude_types[]=poll"
if (excludetxt || excludetxt != '') {
excludetxt = excludetxt + '&exclude_types[]=poll'
} else {
excludetxt = "?exclude_types[]=poll"
excludetxt = '?exclude_types[]=poll'
}
} else {
}
localStorage.setItem("exclude-" + key, excludetxt)
parseColumn();
localStorage.setItem('exclude-' + key, excludetxt)
parseColumn(key)
}
function excludeCk(key, target) {
var exc = localStorage.getItem("exclude-" + key);
var exc = localStorage.getItem('exclude-' + key)
if (!exc) {
return "";
return ''
}
if (~exc.indexOf(target)) {
return "checked"
return 'checked'
} else {
return "";
return ''
}
}
function checkNotfFilter(tlid){
var excludetxt = localStorage.getItem("exclude-" + tlid);
if(!excludetxt || excludetxt != ""){
return true;
}else{
return false;
}
}
function resetNotfFilter(tlid){
localStorage.setItem("exclude-" + tlid, "")
parseColumn();
}
function notfFilter(id,tlid,acct_id){
var excludetxt = localStorage.getItem("exclude-" + tlid);
if (excludetxt || excludetxt !="") {
excludetxt = excludetxt + "&account_id="+id
function checkNotfFilter(tlid) {
var excludetxt = localStorage.getItem('exclude-' + tlid)
if (!excludetxt || excludetxt != '') {
return true
} else {
excludetxt = "?account_id="+id
return false
}
localStorage.setItem("exclude-" + tlid, excludetxt)
parseColumn();
}
}
function resetNotfFilter(tlid) {
localStorage.setItem('exclude-' + tlid, '')
parseColumn(tlid)
}
function notfFilter(id, tlid, acct_id) {
var excludetxt = localStorage.getItem('exclude-' + tlid)
if (excludetxt || excludetxt != '') {
excludetxt = excludetxt + '&account_id=' + id
} else {
excludetxt = '?account_id=' + id
}
localStorage.setItem('exclude-' + tlid, excludetxt)
parseColumn(tlid)
}

View File

@@ -1,262 +1,358 @@
function listMenu() {
$("#left-menu div").removeClass("active");
$("#listMenu").addClass("active");
$(".menu-content").addClass("hide");
$("#list-box").removeClass("hide");
$('ul.tabs').tabs('select_tab', 'src-sta');
$("#src-contents").html("");
$('#left-menu div').removeClass('active')
$('#listMenu').addClass('active')
$('.menu-content').addClass('hide')
$('#list-box').removeClass('hide')
$('ul.tabs').tabs('select_tab', 'src-sta')
$('#src-contents').html('')
}
function list() {
$("#lists-user").html("");
var acct_id = $("#list-acct-sel").val();
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
if (localStorage.getItem("mode_" + domain) == "misskey") {
var start = "https://" + domain + "/api/users/lists/list"
$('#lists-user').html('')
var acct_id = $('#list-acct-sel').val()
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
if (localStorage.getItem('mode_' + domain) == 'misskey') {
var start = 'https://' + domain + '/api/users/lists/list'
fetch(start, {
method: 'POST',
body: JSON.stringify({
i: at
}),
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
if (json) {
var lists = "";
Object.keys(json).forEach(function (key) {
var list = json[key];
lists = lists + escapeHTML(list.title) + ':<a onclick="listShow(\'' + list.id + '\',\'' + escapeHTML(list.title) + '\',\'' + acct_id +
'\')" class="pointer">' + lang.lang_list_show + '</a><br>';
});
$("#lists").html(lists);
} else {
$("#lists").html(lang.lang_list_nodata);
}
});
})
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
if (json) {
var lists = ''
Object.keys(json).forEach(function(key) {
var list = json[key]
lists =
lists +
escapeHTML(list.title) +
`:<a onclick="listShow('${list.id}','${escapeHTML(
list.title
)}','${acct_id}')" class="pointer">
${lang.lang_list_show}
</a><br>`
})
$('#lists').html(lists)
} else {
$('#lists').html(lang.lang_list_nodata)
}
})
} else {
var start = "https://" + domain + "/api/v1/lists"
var start = 'https://' + domain + '/api/v1/lists'
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
if (json) {
var lists = "";
Object.keys(json).forEach(function (key) {
var list = json[key];
lists = lists + escapeHTML(list.title) + ':<a onclick="listShow(\'' + list.id + '\',\'' + escapeHTML(list.title) + '\',\'' + acct_id +
'\')" class="pointer">' + lang.lang_list_show + '</a>/<a onclick="listUser(\'' + list.id + '\',' + acct_id +
')" class="pointer">' + lang.lang_list_users + '</a><br>';
});
$("#lists").html(lists);
} else {
$("#lists").html(lang.lang_list_nodata);
Authorization: 'Bearer ' + at
}
});
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
if (json) {
var lists = ''
Object.keys(json).forEach(function(key) {
var list = json[key]
lists =
lists +
escapeHTML(list.title) +
`:<a onclick="listShow('${list.id}','${escapeHTML(
list.title
)}','${acct_id}')" class="pointer">
${lang.lang_list_show}
</a>/
<a onclick="listUser('${list.id}','${acct_id}')" class="pointer">
${lang.lang_list_users}
'</a><br>`
})
$('#lists').html(lists)
} else {
$('#lists').html(lang.lang_list_nodata)
}
})
}
}
function makeNewList() {
var acct_id = $("#list-acct-sel").val();
var text = $("#list-add").val();
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
if (localStorage.getItem("mode_" + domain) != "misskey") {
var start = "https://" + domain + "/api/v1/lists"
var httpreq = new XMLHttpRequest();
httpreq.open('POST', start, true);
httpreq.setRequestHeader('Content-Type', 'application/json');
httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
httpreq.responseType = "json";
httpreq.send(JSON.stringify({
title: text
}));
httpreq.onreadystatechange = function () {
var acct_id = $('#list-acct-sel').val()
var text = $('#list-add').val()
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
if (localStorage.getItem('mode_' + domain) != 'misskey') {
var start = 'https://' + domain + '/api/v1/lists'
var httpreq = new XMLHttpRequest()
httpreq.open('POST', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json'
httpreq.send(
JSON.stringify({
title: text
})
)
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
var json = httpreq.response;
list();
$("#list-add").val("")
var json = httpreq.response
if (this.status !== 200) {
setLog(start, this.status, this.response)
}
list()
$('#list-add').val('')
}
}
} else {
var start = "https://" + domain + "/api/users/lists/create"
var httpreq = new XMLHttpRequest();
httpreq.open('POST', start, true);
httpreq.setRequestHeader('Content-Type', 'application/json');
httpreq.responseType = "json";
httpreq.send(JSON.stringify({
i: at,
title: text
}));
httpreq.onreadystatechange = function () {
var start = 'https://' + domain + '/api/users/lists/create'
var httpreq = new XMLHttpRequest()
httpreq.open('POST', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
httpreq.responseType = 'json'
httpreq.send(
JSON.stringify({
i: at,
title: text
})
)
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
var json = httpreq.response;
list();
$("#list-add").val("")
var json = httpreq.response
if (this.status !== 200) {
setLog(start, this.status, this.response)
}
list()
$('#list-add').val('')
}
}
}
}
function listShow(id, title, acct_id) {
localStorage.setItem("list_" + id + "_" + acct_id, title);
tl('list', id, acct_id, 'add');
localStorage.setItem('list_' + id + '_' + acct_id, title)
tl('list', id, acct_id, 'add')
}
function listUser(id, acct_id) {
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/v1/lists/" + id + "/accounts"
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/v1/lists/' + id + '/accounts'
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
if (json) {
var lists = "";
var templete = userparse(json, '', acct_id);
if (!json[0]) {
templete = lang.lang_list_nouser;
}
$("#lists-user").html(templete);
} else {
$("#lists-user").html(lang.lang_list_nouser);
Authorization: 'Bearer ' + at
}
});
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
if (json) {
var lists = ''
var templete = userparse(json, '', acct_id)
if (!json[0]) {
templete = lang.lang_list_nouser
}
$('#lists-user').html(templete)
jQuery('time.timeago').timeago()
} else {
$('#lists-user').html(lang.lang_list_nouser)
}
})
}
function hisList(user, acct_id) {
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
if (localStorage.getItem("mode_" + domain) != "misskey") {
var start = "https://" + domain + "/api/v1/lists"
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
if (localStorage.getItem('mode_' + domain) != 'misskey') {
var start = 'https://' + domain + '/api/v1/lists'
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
if (json) {
var lists = lang.lang_list_add + "<br>";
Object.keys(json).forEach(function (key) {
var list = json[key];
lists = lists + '<a onclick="listAdd(\'' + list.id + '\',\'' + user + '\',\'' + acct_id +
'\')" class="pointer">' + escapeHTML(list.title) + '</a><br> ';
});
$("#his-lists-a").html(lists);
} else {
$("#his-lists-a").html(lang.lang_list_nodata);
Authorization: 'Bearer ' + at
}
});
var start = "https://" + domain + "/api/v1/accounts/" + user + "/lists"
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
if (json) {
var lists = lang.lang_list_add + '<br>'
Object.keys(json).forEach(function(key) {
var list = json[key]
lists =
lists +
`<a onclick="listAdd('${list.id}','${user}','${acct_id}')" class="pointer">
${escapeHTML(list.title)}
</a><br> `
})
$('#his-lists-a').html(lists)
} else {
$('#his-lists-a').html(lang.lang_list_nodata)
}
})
var start = 'https://' + domain + '/api/v1/accounts/' + user + '/lists'
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
if (json) {
var lists = lang.lang_list_remove + "<br>";
Object.keys(json).forEach(function (key) {
var list = json[key];
lists = lists + '<a onclick="listRemove(\'' + list.id + '\',\'' + user + '\',\'' + acct_id +
'\')" class="pointer">' + escapeHTML(list.title) + '</a><br> ';
});
$("#his-lists-b").html(lists);
} else {
$("#his-lists-b").html(lang.lang_list_nodata);
Authorization: 'Bearer ' + at
}
});
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
if (json) {
var lists = lang.lang_list_remove + '<br>'
Object.keys(json).forEach(function(key) {
var list = json[key]
lists =
lists +
`<a onclick="listRemove('${list.id}','${user}','${acct_id}')" class="pointer">
${escapeHTML(list.title)}
</a><br> `
})
$('#his-lists-b').html(lists)
} else {
$('#his-lists-b').html(lang.lang_list_nodata)
}
})
} else {
var start = "https://" + domain + "/api/users/lists/list"
var start = 'https://' + domain + '/api/users/lists/list'
fetch(start, {
method: 'POST',
body: JSON.stringify({
i: at
}),
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
if (json) {
var lists = "";
Object.keys(json).forEach(function (key) {
var list = json[key];
lists = lists + list.title + ':<a onclick="listShow(\'' + list.id + '\',\'' + escapeHTML(list.title) + '\',\'' + acct_id +
'\')" class="pointer">' + lang.lang_list_show + '</a>/<a onclick="listAdd(\'' + list.id + '\',\'' + user + '\',\'' + acct_id +
'\')" class="pointer">' + lang.lang_list_add + lang.lang_list_add_misskey + '</a><br>';
});
$("#his-lists-a").html(lists);
} else {
$("#his-lists-a").html(lang.lang_list_nodata);
}
});
$("#his-lists-b").html("");
})
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
if (json) {
var lists = ''
Object.keys(json).forEach(function(key) {
var list = json[key]
lists =
lists +
list.title +
`:<a onclick="listShow('${list.id}','${escapeHTML(
list.title
)}','${acct_id}')" class="pointer">
${lang.lang_list_show}
</a>/
<a onclick="listAdd('${list.id}','${user}','${acct_id}')" class="pointer">
${lang.lang_list_add}
${lang.lang_list_add_misskey}
'</a><br>`
})
$('#his-lists-a').html(lists)
} else {
$('#his-lists-a').html(lang.lang_list_nodata)
}
})
$('#his-lists-b').html('')
}
}
function listAdd(id, user, acct_id) {
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
if (localStorage.getItem("mode_" + domain) == "misskey") {
var start = "https://" + domain + "/api/users/lists/push"
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
if (localStorage.getItem('mode_' + domain) == 'misskey') {
var start = 'https://' + domain + '/api/users/lists/push'
var i = {
i: at,
listId: id,
userId: user
}
} else {
var start = "https://" + domain + "/api/v1/lists/" + id + "/accounts"
var start = 'https://' + domain + '/api/v1/lists/' + id + '/accounts'
var i = {
account_ids: [user]
}
}
var httpreq = new XMLHttpRequest();
httpreq.open('POST', start, true);
httpreq.setRequestHeader('Content-Type', 'application/json');
httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
httpreq.responseType = "json";
httpreq.send(JSON.stringify(i));
httpreq.onreadystatechange = function () {
var httpreq = new XMLHttpRequest()
httpreq.open('POST', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json'
httpreq.send(JSON.stringify(i))
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
var json = httpreq.response;
var json = httpreq.response
if (this.status !== 200) {
setLog(start, this.status, this.response)
}
hisList(user, acct_id)
}
}
}
function listRemove(id, user, acct_id) {
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
if (localStorage.getItem("mode_" + domain) == "misskey") {
var start = "https://" + domain + "/api/users/lists/push"
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
if (localStorage.getItem('mode_' + domain) == 'misskey') {
var start = 'https://' + domain + '/api/users/lists/push'
var method = 'POST'
var i = {
i: at,
@@ -264,22 +360,25 @@ function listRemove(id, user, acct_id) {
userId: user
}
} else {
var start = "https://" + domain + "/api/v1/lists/" + id + "/accounts"
var start = 'https://' + domain + '/api/v1/lists/' + id + '/accounts'
var method = 'DELETE'
var i = {
account_ids: [user]
}
}
var httpreq = new XMLHttpRequest();
httpreq.open(method, start, true);
httpreq.setRequestHeader('Content-Type', 'application/json');
httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
httpreq.responseType = "json";
httpreq.send(JSON.stringify(i));
httpreq.onreadystatechange = function () {
var httpreq = new XMLHttpRequest()
httpreq.open(method, start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json'
httpreq.send(JSON.stringify(i))
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
var json = httpreq.response;
var json = httpreq.response
if (this.status !== 200) {
setLog(start, this.status, this.response)
}
hisList(user, acct_id)
}
}
}
}

View File

@@ -184,9 +184,9 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
noticeavatar = toot.user.avatarUrl;
}
noticeavatar = '<a onclick="udg(\'' + toot.user.id +
'\',' + acct_id + ');" user="' + toot.user.username + '" class="udg">' +
'\',' + acct_id + ');" user="' + toot.user.username + '" class="udg notf-icon">' +
'<img src="' + noticeavatar +
'" width="20" class="notf-icon prof-img" user="' + toot.user.username +
'" width="20" class="prof-img" user="' + toot.user.username +
'"></a>';
if (toot.type == "reply") {
var what = lang.lang_parse_mentioned;
@@ -268,19 +268,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
body: toot.user.name + "(" + toot.user.username + ")" + what + "\n\n" + $.strip_tagstemp(toot.note.text),
icon: toot.user.avatarUrl
};
if (os == "darwin") {
var n = new Notification('TheDesk:' + domain, options);
} else {
var nativeNotfOpt = [
'TheDesk:' + domain,
toot.user.name + "(" + toot.user.username + ")" + what + "\n\n" + $.strip_tagstemp(toot.note.text),
toot.user.avatarUrl,
"toot",
acct_id,
toot.note.id
]
postMessage(["nativeNotf", nativeNotfOpt], "*")
}
var n = new Notification('TheDesk:' + domain, options);
}
if (localStorage.getItem("hasNotfC_" + acct_id) != "true") {
$(".notf-icon_" + acct_id).addClass("red-text");
@@ -375,7 +363,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
var spoiler = "cw cw_hide_" + toot.id;
var api_spoil = "gray";
var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
'\')" class="nex parsed">' + lang.lang_parse_cwshow + '</a><br>';
'\')" class="nex parsed cw_btn">' + lang.lang_parse_cwshow + '</a><br>';
} else {
var ct1 = nl2br(toot.text).split('<br />').length - 2;
var ct2 = nl2br(toot.text).split('<br>').length - 2;
@@ -387,7 +375,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
'</span><span class="gray">' + lang.lang_parse_autofold + '</span>';
var spoiler = "cw cw_hide_" + toot.id;
var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
'\')" class="nex parsed">' + lang.lang_parse_more + '</a><br>';
'\')" class="nex parsed cw_btn">' + lang.lang_parse_more + '</a><br>';
} else {
var content = escapeHTMLtemp(toot.text);
if (toot.cw) {
@@ -510,7 +498,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
acct_id + ')" id="' + id + '-image-' + key2 + '" data-url="' + url +
'" data-type="image" class="img-parsed"><img src="' +
purl + '" class="' + sense +
' toot-img pointer" style="width:' + cwdt + '%; height:' + imh + 'px;"></a></span>';
' toot-img pointer" style="width:' + cwdt + '%; height:' + imh + 'px;" onerror="this.src=\'../../img/loading.svg\'"></a></span>';
}
});
@@ -532,7 +520,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
if (tagck) {
Object.keys(toot.tags).forEach(function (key4) {
var tag = toot.tags[key4];
var tags = '<a onclick="tagShow(\'' + tag + '\')" class="pointer parsed">#' + tag + '</a><span class="hide" data-tag="' + tag + '">#' + tag + ':<a onclick="tl(\'tag\',\'' + tag + '\',' + acct_id +
var tags = '<a onclick="tagShow(\'' + tag + '\')" class="pointer parsed">#' + tag + '</a><span class="hide" data-tag="' + tag + '" data-regTag="'+tag.toLowerCase()+'">#' + tag + ':<a onclick="tl(\'tag\',\'' + tag + '\',' + acct_id +
',\'add\')" class="pointer parsed" title="' + lang.lang_parse_tagTL.replace("{{tag}}", '#' + tag) + '">TL</a> <a onclick="brInsert(\'#' + tag + '\')" class="pointer parsed" title="' + lang.lang_parse_tagtoot.replace("{{tag}}", '#' + tag) + '">Toot</a> ' +
'<a onclick="tagPin(\'' + tag + '\')" class="pointer parsed" title="' + lang.lang_parse_tagpin.replace("{{tag}}", '#' + tag) + '">Pin</a></span> ';
content = content.replace("#" + tag, tags);
@@ -581,7 +569,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
var rt_app = "";
/*
if (toot.reblogged) {
var if_rt = "teal-text";
var if_rt = "light-blue-text";
var rt_app = "rted";
} else {
var if_rt = "";
@@ -788,7 +776,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
'\',' + acct_id + ');" user="' + toot.user.username + '" class="udg">' +
'<img src="' + avatar +
'" width="40" class="prof-img" user="' + toot.user.username +
'"></a></div>' +
'" onerror="this.src=\'../../img/loading.svg\'"></a></div>' +
'<div class="area-display_name"><div class="flex-name"><span class="user">' +
dis_name +
'</span><span class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis; cursor:text;"> @' +
@@ -832,10 +820,10 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
'<div class="action ' + disp["re"] + ' ' + noauth + '"><a onclick="misskeyreply(\'' + toot.id +
'\',\'' + acct_id + '\',' +
acct_id + ',\'' + visen +
'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_replyto + '"><i class="fas fa-share"></i></a></div>' +
'\')" class="waves-effect waves-dark btn-flat rep-btn" style="padding:0" title="' + lang.lang_parse_replyto + '"><i class="fas fa-share"></i></a></div>' +
'<div class="action ' + can_rt + ' ' + disp["rt"] + ' ' + noauth + '"><a onclick="renote(\'' + toot.id + '\',' + acct_id +
',\'' + tlid +
'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_misskeyparse_renote + '"><i class="text-darken-3 fas fa-retweet ' +
'\')" class="waves-effect waves-dark btn-flat bt-btn" style="padding:0" title="' + lang.lang_misskeyparse_renote + '"><i class="text-darken-3 fas fa-retweet ' +
if_rt + ' rt_' + toot.id + '"></i><span class="rt_ct"></span></a></div>' +
'<div class="action ' + can_rt + ' ' + disp["qt"] + ' ' + noauth + '"><a onclick="renoteqt(\'' + toot.id + '\',' + acct_id +
',\'misskey.xyz\',\'misskey.xyz\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_misskeyparse_renoteqt + '"><i class="text-darken-3 fas fa-quote-right"></i></a></div>' +
@@ -917,19 +905,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
icon: toot.avatar
};
var domain = localStorage.getItem("domain_" + acct_id);
if (os == "darwin") {
var n = new Notification('TheDesk:' + domain, options);
} else {
var nativeNotfOpt = [
'TheDesk:' + domain,
toot.display_name + "(" + toot.acct + ")" + ftxt,
toot.avatar,
"userdata",
acct_id,
toot.id
]
postMessage(["nativeNotf", nativeNotfOpt], "*")
}
var n = new Notification('TheDesk:' + domain, options);
}
}
if (toot.name) {
@@ -979,7 +955,7 @@ function goGoogle(id) {
}
var misskeyws = []
var misskeywsstate = []
function connectMisskey(acct_id) {
function connectMisskey(acct_id, re) {
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "wss://" + domain +
@@ -1001,7 +977,6 @@ function connectMisskey(acct_id) {
var mute = [];
if (data.body.id.indexOf("notf:") !== -1) {
var obj = JSON.parse(mess.data).body;
console.log(obj);
var popup = localStorage.getItem("popup");
if (!popup) {
popup = 0;
@@ -1063,13 +1038,17 @@ function connectMisskey(acct_id) {
console.error("Error closing " + tlid);
console.error(error);
misskeywsstate[wsid] = false
connectMisskey(acct_id)
if(!re){
connectMisskey(acct_id, true)
}
return false;
};
misskeyws[wsid].onclose = function () {
console.warn("Closing " + tlid);
misskeywsstate[wsid] = false
connectMisskey(acct_id)
if(!re){
connectMisskey(acct_id, true)
}
return false;
};

View File

@@ -1,327 +1,201 @@
//Integrated TL
function mixtl(acct_id, tlid, type, delc, voice) {
localStorage.removeItem("morelock")
localStorage.setItem("now", type);
todo("Integrated TL Loading...(Local)");
//まずLocal
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/v1/timelines/public?local=true";
fetch(start, {
async function mixtl(acct_id, tlid, type, delc, voice) {
localStorage.setItem('now', type)
todo('Integrated TL Loading...(Local)')
const domain = localStorage.getItem('domain_' + acct_id)
let startLocal = 'https://' + domain + '/api/v1/timelines/public?local=true'
let local = await getTL(startLocal, acct_id)
let startHome = 'https://' + domain + '/api/v1/timelines/home'
let home = await getTL(startHome, acct_id)
let concated = _.concat(local, home)
let uniqued = _.uniqBy(concated, 'id')
let sorted = _.orderBy(uniqued, ['id'], ['desc'])
let integrated = _.slice(sorted, 0, 19)
$('#landing_' + tlid).hide()
let mute = getFilterTypeByAcct(acct_id, 'mix')
let templete = parse(integrated, type, acct_id, tlid, '', mute, type)
localStorage.setItem('lastobj_' + tlid, integrated[0].id)
$('#timeline_' + tlid).html(templete)
additional(acct_id, tlid)
jQuery('time.timeago').timeago()
todc()
mixre(acct_id, tlid, 'mix', mute, voice, '')
$(window).scrollTop(0)
lastId = integrated[0].id
beforeLastId = integrated[1].id
}
async function getTL(start, acct_id) {
const at = localStorage.getItem('acct_' + acct_id + '_at')
let promise = await fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (jsonL) {
var start = "https://" + domain + "/api/v1/timelines/home";
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (jsonH) {
var homearr = [];
var timeline = jsonL.concat(jsonH);
timeline.sort(function (a, b) {
if (date(a.created_at, "unix") >= date(b.created_at, "unix")) return -1;
if (date(a.created_at, "unix") < date(b.created_at, "unix")) return 1;
return 0;
});
if (type == "integrated") {
timeline.splice(20);
}
var templete = "";
if (localStorage.getItem("filter_" + acct_id) != "undefined") {
var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), "mix");
} else {
var mute = [];
}
Object.keys(timeline).forEach(function (key) {
var pkey = key * 1 + 1;
if (pkey < timeline.length) {
if (date(timeline[key].created_at, "unix") != date(timeline[pkey].created_at, "unix")) {
if (type == "integrated") {
templete = templete + parse([timeline[key]], '', acct_id, tlid, "", mute, "mix");
} else if (type == "plus") {
if (timeline[key].account.acct == timeline[key].account.username) {
templete = templete + parse([timeline[key]], '', acct_id, tlid, "", mute, "plus");
}
}
}
}
});
$("#landing_" + tlid).hide();
$("#timeline_" + tlid).html(templete);
mixre(acct_id, tlid, type, mute, delc, voice);
additional(acct_id, tlid);
jQuery("time.timeago").timeago();
todc();
});
});
Authorization: 'Bearer ' + at
}
})
if (!promise.ok) {
promise.text().then(function(text) {
setLog(promise.url, promise.status, text)
})
}
return await promise.json()
}
//Streamingに接続
function mixre(acct_id, tlid, TLtype, mute, delc, voice, mode) {
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
if (localStorage.getItem("streaming_" + acct_id)) {
var wss = localStorage.getItem("streaming_" + acct_id)
function mixre(acct_id, tlid, TLtype, mute, voice, mode) {
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
if (localStorage.getItem('streaming_' + acct_id)) {
var wss = localStorage.getItem('streaming_' + acct_id)
} else {
var wss = "wss://" + domain
var wss = 'wss://' + domain
}
var startHome = wss +
"/api/v1/streaming/?stream=user&access_token=" + at;
var startLocal = wss +
"/api/v1/streaming/?stream=public:local&access_token=" + at;
var wshid = websocketHome.length;
var wslid = websocketLocal.length;
websocketHome[wshid] = new WebSocket(startHome);
websocketLocal[wslid] = new WebSocket(startLocal);
websocketHome[wshid].onopen = function (mess) {
localStorage.setItem("wssH_" + tlid, wshid);
console.table({ "tlid": tlid, "type": "Connect Streaming API(Integrated:Home)", "domain": domain, "message": mess })
$("#notice_icon_" + tlid).removeClass("red-text");
var startHome = wss + '/api/v1/streaming/?stream=user&access_token=' + at
var startLocal = wss + '/api/v1/streaming/?stream=public:local&access_token=' + at
var wshid = wsHome.length
var wslid = wsLocal.length
wsHome[wshid] = new WebSocket(startHome)
wsLocal[wslid] = new WebSocket(startLocal)
wsHome[wshid].onopen = function(mess) {
localStorage.setItem('wssH_' + tlid, wshid)
console.table({
tlid: tlid,
type: 'Connect Streaming API(Integrated:Home)',
domain: domain,
message: mess
})
$('#notice_icon_' + tlid).removeClass('red-text')
}
websocketLocal[wslid].onopen = function (mess) {
localStorage.setItem("wssL_" + tlid, wslid);
console.table({ "tlid": tlid, "type": "Connect Streaming API(Integrated:Local)", "domain": domain, "message": mess })
$("#notice_icon_" + tlid).removeClass("red-text");
wsLocal[wslid].onopen = function(mess) {
localStorage.setItem('wssL_' + tlid, wslid)
console.table({
tlid: tlid,
type: 'Connect Streaming API(Integrated:Local)',
domain: domain,
message: mess
})
$('#notice_icon_' + tlid).removeClass('red-text')
}
websocketLocal[wslid].onmessage = function (mess) {
console.log(["Receive Streaming API:(Integrated:Local)", obj]);
var obj = JSON.parse(JSON.parse(mess.data).payload);
var type = JSON.parse(mess.data).event;
if (type == "delete") {
if (delc == "true") {
$("#timeline_" + tlid + " [toot-id=" + JSON.parse(mess.data).payload + "]").addClass("emphasized");
$("#timeline_" + tlid + " [toot-id=" + JSON.parse(mess.data).payload + "]").addClass("by_delcatch");
} else {
$("[toot-id=" + JSON.parse(mess.data).payload + "]").hide();
$("[toot-id=" + JSON.parse(mess.data).payload + "]").remove();
}
} else if (type == "update") {
var templete = parse([obj], '', acct_id, tlid, "", mute);
if ($("#timeline_" + tlid + " [toot-id=" + obj.id + "]").length < 1) {
if (voice) {
say(obj.content)
}
var templete = parse([obj], type, acct_id, tlid, "", mute, "mix");
var pool = localStorage.getItem("pool_" + tlid);
if (pool) {
pool = templete + pool;
} else {
pool = templete
}
localStorage.setItem("pool_" + tlid, pool);
scrollck();
additional(acct_id, tlid);
jQuery("time.timeago").timeago();
} else {
todo("二重取得発生中");
}
}
wsLocal[wslid].onmessage = function(mess) {
console.log('Receive Streaming API:(Integrated:Local)', mess)
integratedMessage(mess, acct_id, tlid, mute, voice)
}
websocketHome[wshid].onmessage = function (mess) {
console.log(["Receive Streaming API:(Integrated:Home)", obj]);
var obj = JSON.parse(JSON.parse(mess.data).payload);
var type = JSON.parse(mess.data).event;
if (type == "delete") {
if (del > 10) {
reconnector(tlid, type, acct_id, data)
} else {
localStorage.setItem("delete", del * 1 + 1)
}
if (delc == "true") {
$("[toot-id=" + JSON.parse(mess.data).payload + "]").addClass("emphasized");
$("[toot-id=" + JSON.parse(mess.data).payload + "]").addClass("by_delcatch");
} else {
$("[toot-id=" + JSON.parse(mess.data).payload + "]").hide();
$("[toot-id=" + JSON.parse(mess.data).payload + "]").remove();
}
} else if (type == "update") {
localStorage.removeItem("delete");
if (TLtype == "integrated") {
var templete = parse([obj], '', acct_id, tlid);
} else if (TLtype == "plus") {
if (obj.account.acct == obj.account.username) {
var templete = parse([obj], '', acct_id, tlid, "", mute, "mix");
} else {
var templete = "";
}
}
if ($("#timeline_" + tlid + " [toot-id=" + obj.id + "]").length < 1) {
if (voice) {
say(obj.content)
}
var templete = parse([obj], type, acct_id, tlid, "", mute, "mix");
var pool = localStorage.getItem("pool_" + tlid);
if (pool) {
pool = templete + pool;
} else {
pool = templete
}
localStorage.setItem("pool_" + tlid, pool);
scrollck();
additional(acct_id, tlid);
jQuery("time.timeago").timeago();
} else {
todo("二重取得発生中");
}
}
wsHome[wshid].onmessage = function(mess) {
console.log(['Receive Streaming API:(Integrated:Home)', mess])
integratedMessage(mess, acct_id, tlid, mute, voice)
}
websocketLocal[wslid].onerror = function (error) {
wsLocal[wslid].onerror = function(error) {
console.error('WebSocketLocal Error')
console.error(error);
if (mode == "error") {
$("#notice_icon_" + tlid).addClass("red-text");
todo('WebSocket Error ' + error);
console.error(error)
$('#notice_icon_' + tlid).addClass('red-text')
if (mode == 'error') {
todo('WebSocket Error ' + error)
} else {
var errorct = localStorage.getItem("wserror_" + tlid) * 1 + 1;
localStorage.setItem("wserror_" + tlid, errorct);
var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
localStorage.setItem('wserror_' + tlid, errorct)
if (errorct < 3) {
reconnector(tlid, TLtype, acct_id, "", "error");
reconnector(tlid, TLtype, acct_id, '', 'error')
}
}
};
websocketLocal[wslid].onclose = function () {
console.warn('WebSocketLocal Closing:' + tlid);
if (mode == "error") {
$("#notice_icon_" + tlid).addClass("red-text");
todo('WebSocket Closed');
}
wsLocal[wslid].onclose = function() {
console.warn('WebSocketLocal Closing:' + tlid)
$('#notice_icon_' + tlid).addClass('red-text')
if (mode == 'error') {
todo('WebSocket Closed')
} else {
var errorct = localStorage.getItem("wserror_" + tlid) * 1 + 1;
localStorage.setItem("wserror_" + tlid, errorct);
var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
localStorage.setItem('wserror_' + tlid, errorct)
if (errorct < 3) {
reconnector(tlid, TLtype, acct_id, "", "error");
reconnector(tlid, TLtype, acct_id, '', 'error')
}
}
};
websocketHome[wshid].onerror = function (error) {
}
wsHome[wshid].onerror = function(error) {
console.error(['WebSocketHome Error', error])
if (mode == "error") {
$("#notice_icon_" + tlid).addClass("red-text");
todo('WebSocket Error ' + error);
$('#notice_icon_' + tlid).addClass('red-text')
if (mode == 'error') {
todo('WebSocket Error ' + error)
} else {
var errorct = localStorage.getItem("wserror_" + tlid) * 1 + 1;
localStorage.setItem("wserror_" + tlid, errorct);
var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
localStorage.setItem('wserror_' + tlid, errorct)
if (errorct < 3) {
reconnector(tlid, TLtype, acct_id, "", "error");
reconnector(tlid, TLtype, acct_id, '', 'error')
}
}
};
websocketHome[wshid].onclose = function () {
console.warn('WebSocketHome Closing:' + tlid);
if (mode == "error") {
$("#notice_icon_" + tlid).addClass("red-text");
todo('WebSocket Closed');
}
wsHome[wshid].onclose = function() {
console.warn('WebSocketHome Closing:' + tlid)
$('#notice_icon_' + tlid).addClass('red-text')
if (mode == 'error') {
todo('WebSocket Closed')
} else {
var errorct = localStorage.getItem("wserror_" + tlid) * 1 + 1;
localStorage.setItem("wserror_" + tlid, errorct);
var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
localStorage.setItem('wserror_' + tlid, errorct)
if (errorct < 3) {
reconnector(tlid, TLtype, acct_id, "", "error");
reconnector(tlid, TLtype, acct_id, '', 'error')
}
}
};
}
}
//ある程度のスクロールで発火
function mixmore(tlid, type) {
var multi = localStorage.getItem("column");
var obj = JSON.parse(multi);
var acct_id = obj[tlid].domain;
moreloading = true;
todo("Integrated TL MoreLoading...(Local)");
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
var sid = $("#timeline_" + tlid + " .cvo").last().attr("unique-id");
var start = "https://" + domain + "/api/v1/timelines/public?local=true&max_id=" + sid;
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (jsonL) {
var start = "https://" + domain + "/api/v1/timelines/home?max_id=" + sid;
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (jsonH) {
var homearr = [];
var timeline = jsonL.concat(jsonH);
timeline.sort(function (a, b) {
if (date(a.created_at, "unix") > date(b.created_at, "unix")) return -1;
if (date(a.created_at, "unix") < date(b.created_at, "unix")) return 1;
return 0;
});
timeline.splice(20);
var templete = "";
Object.keys(timeline).forEach(function (key) {
var pkey = key * 1 + 1;
if (pkey < 20) {
if (date(timeline[key].created_at, "unix") != date(timeline[pkey].created_at, "unix")) {
if (localStorage.getItem("filter_" + acct_id) != "undefined") {
var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), "mix");
} else {
var mute = [];
}
if (type == "integrated") {
templete = templete + parse([timeline[key]], '', acct_id, tlid, "", mute, "mix");
} else if (type == "plus") {
if (timeline[key].account.acct == timeline[key].account.username) {
templete = templete + parse([timeline[key]], '', acct_id, tlid, "", mute, "mix");
}
}
}
function integratedMessage(mess, acct_id, tlid, mute, voice) {
let data = JSON.parse(mess.data)
let type = data.event
let payload = data.payload
if (type == 'delete') {
$('[unique-id=' + payload + ']').hide()
$('[unique-id=' + payload + ']').remove()
} else if (type == 'update') {
let obj = JSON.parse(payload)
if (obj.id != lastId && obj.id != beforeLastId) {
lastId = obj.id
beforeLastId = obj.id
let dom = parse([obj], '', acct_id, tlid, '', mute)
if (voice) say(obj.content)
if ($('timeline_box_' + tlid + '_box .tl-box').scrollTop() === 0) {
$('#timeline_' + tlid).prepend(dom)
} else {
let pool = localStorage.getItem('pool_' + tlid)
if (pool) {
pool = dom + pool
} else {
pool = dom
}
});
$("#timeline_" + tlid).append(templete);
additional(acct_id, tlid);
jQuery("time.timeago").timeago();
moreloading = false;
todc();
});
});
localStorage.setItem('pool_' + tlid, pool)
}
scrollck()
additional(acct_id, tlid)
jQuery('time.timeago').timeago()
}
}
}
//ある程度のスクロールで発火
async function mixmore(tlid, type) {
var multi = localStorage.getItem('column')
var obj = JSON.parse(multi)
var acct_id = obj[tlid].domain
moreloading = true
todo('Integrated TL MoreLoading...(Local)')
const domain = localStorage.getItem('domain_' + acct_id)
const sid = $('#timeline_' + tlid + ' .cvo')
.last()
.attr('unique-id')
let startLocal = 'https://' + domain + '/api/v1/timelines/public?local=true&max_id=' + sid
let local = await getTL(startLocal, acct_id)
let startHome = 'https://' + domain + '/api/v1/timelines/home?max_id=' + sid
let home = await getTL(startHome, acct_id)
let concated = _.concat(local, home)
let uniqued = _.uniqBy(concated, 'id')
let sorted = _.orderBy(uniqued, ['id'], ['desc'])
let integrated = _.slice(sorted, 0, 19)
$('#landing_' + tlid).hide()
let mute = getFilterTypeByAcct(acct_id, 'mix')
let templete = parse(integrated, type, acct_id, tlid, '', mute, type)
localStorage.setItem('lastobj_' + tlid, integrated[0].id)
$('#timeline_' + tlid).append(templete)
additional(acct_id, tlid)
jQuery('time.timeago').timeago()
moreloading = false
todc()
}

View File

@@ -1,341 +1,359 @@
//通知
//取得+Streaming接続
function notf(acct_id, tlid, sys) {
if (sys == "direct") {
if (sys == 'direct') {
notfColumn(acct_id, tlid, sys)
} else {
notfCommon(acct_id, tlid, sys)
}
}
function notfColumn(acct_id, tlid, sys) {
todo("Notifications Loading...");
var native = localStorage.getItem("nativenotf");
var at = localStorage.getItem("acct_" + acct_id + "_at");
todo('Notifications Loading...')
var native = localStorage.getItem('nativenotf')
var at = localStorage.getItem('acct_' + acct_id + '_at')
if (!native) {
native = "yes";
native = 'yes'
}
var domain = localStorage.getItem("domain_" + acct_id);
var httpreq = new XMLHttpRequest();
if (localStorage.getItem("mode_" + domain) == "misskey") {
var misskey = true;
var start = "https://" + domain + "/api/i/notifications";
httpreq.open("POST", start, true);
httpreq.setRequestHeader('Content-Type', 'application/json');
var domain = localStorage.getItem('domain_' + acct_id)
var httpreq = new XMLHttpRequest()
if (localStorage.getItem('mode_' + domain) == 'misskey') {
var misskey = true
var start = 'https://' + domain + '/api/i/notifications'
httpreq.open('POST', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
var body = JSON.stringify({
i: at
});
})
} else {
var misskey = false;
if (localStorage.getItem("exclude-" + tlid)) {
var exc = localStorage.getItem("exclude-" + tlid);
var misskey = false
if (localStorage.getItem('exclude-' + tlid)) {
var exc = localStorage.getItem('exclude-' + tlid)
} else {
var exc = "";
var exc = ''
}
var start = "https://" + domain + "/api/v1/notifications" + exc;
httpreq.open("GET", start, true);
httpreq.setRequestHeader('Content-Type', 'application/json');
httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
var body = "";
var start = 'https://' + domain + '/api/v1/notifications' + exc
httpreq.open('GET', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
var body = ''
}
httpreq.responseType = "json";
httpreq.send(body);
httpreq.onreadystatechange = function () {
httpreq.responseType = 'json'
httpreq.send(body)
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
var json = httpreq.response;
var max_id = httpreq.getResponseHeader("link");
var json = httpreq.response
if (this.status !== 200) {
setLog(start, this.status, this.response)
}
var max_id = httpreq.getResponseHeader('link')
if (max_id) {
max_id = max_id.match(/[?&]{1}max_id=([0-9]+)/)[1]
}
if (json[0]) {
var templete = "";
var lastnotf = localStorage.getItem("lastnotf_" + acct_id);
localStorage.setItem("lastnotf_" + acct_id, json[0].id);
Object.keys(json).forEach(function (key) {
var obj = json[key];
if (lastnotf == obj.id && key > 0 && native == "yes") {
var ct = key;
var templete = ''
var lastnotf = localStorage.getItem('lastnotf_' + acct_id)
localStorage.setItem('lastnotf_' + acct_id, json[0].id)
Object.keys(json).forEach(function(key) {
var obj = json[key]
if (lastnotf == obj.id && key > 0 && native == 'yes') {
var ct = key
if (key > 14) {
ct = "15+";
ct = '15+'
}
var os = localStorage.getItem("platform");
var os = localStorage.getItem('platform')
var options = {
body: ct + lang.lang_notf_new,
icon: localStorage.getItem("prof_" + acct_id)
};
if (os == "darwin") {
var n = new Notification('TheDesk:' + domain, options);
} else {
var nativeNotfOpt=['TheDesk:' + domain, ct + lang.lang_notf_new, localStorage.getItem("prof_" + acct_id)]
postMessage(["nativeNotf", nativeNotfOpt], "*")
icon: localStorage.getItem('prof_' + acct_id)
}
var n = new Notification('TheDesk:' + domain, options)
}
if (localStorage.getItem("filter_" + acct_id) != "undefined") {
var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), "notif");
} else {
var mute = [];
}
if (obj.type != "follow") {
var mute = getFilterTypeByAcct(acct_id, 'notif')
//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
if (obj.type != 'follow' && obj.type != 'move' && obj.type != 'follow_request') {
if (misskey) {
templete = templete + misskeyParse([obj], 'notf', acct_id, tlid, -1, mute);
templete = templete + misskeyParse([obj], 'notf', acct_id, tlid, -1, mute)
} else {
templete = templete + parse([obj], 'notf', acct_id, tlid, -1, mute);
templete = templete + parse([obj], 'notf', acct_id, tlid, -1, mute)
}
} else if (obj.type == 'follow_request') {
templete = templete + userparse([obj.account], 'request', acct_id, tlid, -1)
} else {
if (misskey) {
templete = templete + misskeyUserparse([obj], 'notf', acct_id, tlid, -1, mute);
templete = templete + misskeyUserparse([obj], 'notf', acct_id, tlid, -1, mute)
} else {
templete = templete + userparse([obj.account], 'notf', acct_id, tlid, -1);
templete = templete + userparse([obj.account], obj.type, acct_id, tlid, -1)
}
}
});
templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>';
$("#timeline_" + tlid).html(templete);
$("#landing_" + tlid).hide();
jQuery("time.timeago").timeago();
})
templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
$('#timeline_' + tlid).html(templete)
$('#landing_' + tlid).hide()
jQuery('time.timeago').timeago()
}
$('#notf-box').addClass('fetched')
todc()
//Markers
var markers = localStorage.getItem('markers')
if (markers == 'yes') {
markers = true
} else {
markers = false
}
if (markers) {
getMarker(tlid, 'notf', acct_id)
}
$("#notf-box").addClass("fetched");
todc();
}
}
if (!misskey) {
if (localStorage.getItem("streaming_" + acct_id)) {
var wss = localStorage.getItem("streaming_" + acct_id)
if (localStorage.getItem('streaming_' + acct_id)) {
var wss = localStorage.getItem('streaming_' + acct_id)
} else {
var wss = "wss://" + domain
var wss = 'wss://' + domain
}
var start = wss + "/api/v1/streaming/?stream=user&access_token=" +
at;
var start = wss + '/api/v1/streaming/?stream=user&access_token=' + at
} else {
var start = "wss://" + domain + "/?i=" +
at;
var start = 'wss://' + domain + '/?i=' + at
}
}
function notfCommon(acct_id, tlid, sys) {
todo("Notifications Loading...");
var native = localStorage.getItem("nativenotf");
var at = localStorage.getItem("acct_" + acct_id + "_at");
todo('Notifications Loading...')
var native = localStorage.getItem('nativenotf')
var at = localStorage.getItem('acct_' + acct_id + '_at')
if (!native) {
native = "yes";
native = 'yes'
}
var domain = localStorage.getItem("domain_" + acct_id);
if (localStorage.getItem("mode_" + domain) == "misskey") {
var misskey = true;
var start = "https://" + domain + "/api/i/notifications";
var domain = localStorage.getItem('domain_' + acct_id)
if (localStorage.getItem('mode_' + domain) == 'misskey') {
var misskey = true
var start = 'https://' + domain + '/api/i/notifications'
var i = {
method: 'POST',
headers: {
'content-type': 'application/json',
'content-type': 'application/json'
},
body: JSON.stringify({
i: at
})
}
} else {
var misskey = false;
var start = "https://" + domain + "/api/v1/notifications";
var misskey = false
var start = 'https://' + domain + '/api/v1/notifications'
var i = {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
Authorization: 'Bearer ' + at
}
}
}
fetch(start, i).then(function (response) {
console.log("header to get param:" + response.headers.get('link'));
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
if (json[0]) {
var templete = "";
var lastnotf = localStorage.getItem("lastnotf_" + acct_id);
localStorage.setItem("lastnotf_" + acct_id, json[0].id);
Object.keys(json).forEach(function (key) {
var obj = json[key];
if (lastnotf == obj.id && key > 0 && native == "yes") {
var ct = key;
if (key > 14) {
ct = "15+";
fetch(start, i)
.then(function(response) {
console.log('header to get param:' + response.headers.get('link'))
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
if (json[0]) {
var templete = ''
var lastnotf = localStorage.getItem('lastnotf_' + acct_id)
localStorage.setItem('lastnotf_' + acct_id, json[0].id)
Object.keys(json).forEach(function(key) {
var obj = json[key]
if (lastnotf == obj.id && key > 0 && native == 'yes') {
var ct = key
if (key > 14) {
ct = '15+'
}
var os = localStorage.getItem('platform')
var options = {
body: ct + lang.lang_notf_new,
icon: localStorage.getItem('prof_' + acct_id)
}
var n = new Notification('TheDesk:' + domain, options)
}
var os = localStorage.getItem("platform");
var options = {
body: ct + lang.lang_notf_new,
icon: localStorage.getItem("prof_" + acct_id)
};
if (os == "darwin") {
var n = new Notification('TheDesk:' + domain, options);
var mute = getFilterTypeByAcct(acct_id, 'notif')
//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
if (obj.type != 'follow' && obj.type != 'move') {
if (misskey) {
templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute)
} else {
templete = templete + parse([obj], 'notf', acct_id, 'notf', -1, mute)
}
} else {
var nativeNotfOpt=['TheDesk:' + domain, ct + lang.lang_notf_new, localStorage.getItem("prof_" + acct_id)]
postMessage(["nativeNotf", nativeNotfOpt], "*")
if (misskey) {
templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
} else {
templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1)
}
}
}
if (localStorage.getItem("filter_" + acct_id) != "undefined") {
var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), "notif");
} else {
var mute = [];
}
if (obj.type != "follow") {
if (misskey) {
templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute);
} else {
templete = templete + parse([obj], 'notf', acct_id, 'notf', -1, mute);
}
} else {
if (misskey) {
templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute);
} else {
templete = templete + userparse([obj.account], 'notf', acct_id, 'notf', -1);
}
}
});
$("div[data-notf=" + acct_id + "]").html(templete);
$("#landing_" + tlid).hide();
jQuery("time.timeago").timeago();
}
$("#notf-box").addClass("fetched");
todc();
notfWS(misskey, acct_id, tlid, domain, at)
});
})
$('div[data-notf=' + acct_id + ']').html(templete)
$('#landing_' + tlid).hide()
jQuery('time.timeago').timeago()
}
$('#notf-box').addClass('fetched')
todc()
notfWS(misskey, acct_id, tlid, domain, at)
})
}
function notfWS(misskey, acct_id, tlid, domain, at) {
if (!misskey) {
if (localStorage.getItem("streaming_" + acct_id)) {
var wss = localStorage.getItem("streaming_" + acct_id)
if (localStorage.getItem('streaming_' + acct_id)) {
var wss = localStorage.getItem('streaming_' + acct_id)
} else {
var wss = "wss://" + domain
var wss = 'wss://' + domain
}
var start = wss + "/api/v1/streaming/?stream=user&access_token=" +
at;
var wsid = websocketNotf.length;
websocketNotf[acct_id] = new WebSocket(start);
websocketNotf[acct_id].onopen = function (mess) {
console.table({ "acct_id": acct_id, "type": "Connect Streaming API(Notf)", "domain": domain, "message": [mess] })
$("i[data-notf=" + acct_id + "]").removeClass("red-text");
var start = wss + '/api/v1/streaming/?stream=user&access_token=' + at
var wsid = websocketNotf.length
websocketNotf[acct_id] = new WebSocket(start)
websocketNotf[acct_id].onopen = function(mess) {
console.table({
acct_id: acct_id,
type: 'Connect Streaming API(Notf)',
domain: domain,
message: [mess]
})
$('i[data-notf=' + acct_id + ']').removeClass('red-text')
}
websocketNotf[acct_id].onmessage = function (mess) {
console.log(["Receive Streaming API(Notf):" + acct_id + "(" + domain + ")", JSON.parse(JSON.parse(mess.data).payload)]);
var popup = localStorage.getItem("popup");
websocketNotf[acct_id].onmessage = function(mess) {
//console.log(["Receive Streaming API(Notf):" + acct_id + "(" + domain + ")", JSON.parse(JSON.parse(mess.data).payload)]);
var popup = localStorage.getItem('popup')
if (!popup) {
popup = 0;
popup = 0
}
var obj = JSON.parse(JSON.parse(mess.data).payload);
var type = JSON.parse(mess.data).event;
if (type == "notification") {
var templete = "";
localStorage.setItem("lastnotf_" + acct_id, obj.id);
if (obj.type != "follow") {
templete = parse([obj], 'notf', acct_id, 'notf', popup);
} else {
templete = userparse([obj], 'notf', acct_id, 'notf', popup);
var obj = JSON.parse(JSON.parse(mess.data).payload)
var type = JSON.parse(mess.data).event
if (type == 'notification') {
var templete = ''
localStorage.setItem('lastnotf_' + acct_id, obj.id)
if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
//markers show中はダメ
if (obj.type != 'follow') {
templete = parse([obj], 'notf', acct_id, 'notf', popup)
} else {
templete = userparse([obj], obj.type, acct_id, 'notf', popup)
}
if (!$('div[data-notfIndv=' + acct_id + '_' + obj.id + ']').length) {
$('div[data-notf=' + acct_id + ']').prepend(templete)
$('div[data-const=notf_' + acct_id + ']').prepend(templete)
}
jQuery('time.timeago').timeago()
}
if (!$("div[data-notfIndv=" + acct_id + "_" + obj.id + "]").length) {
$("div[data-notf=" + acct_id + "]").prepend(templete);
$("div[data-const=notf_" + acct_id + "]").prepend(templete);
}
jQuery("time.timeago").timeago();
} else if (type == "delete") {
$("[toot-id=" + obj + "]").hide();
$("[toot-id=" + obj + "]").remove();
} else if (type == 'delete') {
$('[toot-id=' + obj + ']').hide()
$('[toot-id=' + obj + ']').remove()
}
}
websocketNotf[acct_id].onerror = function(error) {
console.error('WebSocket Error ' + error)
errorct++
console.log(errorct)
if (errorct < 3) {
notfWS(misskey, acct_id, tlid, domain, at)
}
}
websocketNotf[acct_id].onclose = function(error) {
console.error('WebSocket Close ' + error)
errorct++
console.log(errorct)
if (errorct < 3) {
notfWS(misskey, acct_id, tlid, domain, at)
}
}
websocketNotf[acct_id].onerror = function (error) {
console.error('WebSocket Error ' + error);
notfWS(misskey, acct_id, tlid, domain, at)
};
}
}
//一定のスクロールで発火
function notfmore(tlid) {
console.log({ "status": "kicked", "status": moreloading });
var multi = localStorage.getItem("column");
var obj = JSON.parse(multi);
var acct_id = obj[tlid].domain;
console.log({ status: 'kicked', status: moreloading })
var multi = localStorage.getItem('column')
var obj = JSON.parse(multi)
var acct_id = obj[tlid].domain
if (!type) {
var type = obj[tlid].type;
var type = obj[tlid].type
} else {
var data;
var data
}
var sid = $("#timeline_" + tlid + " .notif-marker").last().attr("data-maxid");
var at = localStorage.getItem("acct_" + acct_id + "_at");
var domain = localStorage.getItem("domain_" + acct_id);
var sid = $('#timeline_' + tlid + ' .notif-marker')
.last()
.attr('data-maxid')
var at = localStorage.getItem('acct_' + acct_id + '_at')
var domain = localStorage.getItem('domain_' + acct_id)
if (sid && !moreloading) {
moreloading = true;
var httpreq = new XMLHttpRequest();
if (localStorage.getItem("mode_" + domain) == "misskey") {
var misskey = true;
var start = "https://" + domain + "/api/i/notifications";
httpreq.open(POST, start, true);
httpreq.setRequestHeader('Content-Type', 'application/json');
moreloading = true
var httpreq = new XMLHttpRequest()
if (localStorage.getItem('mode_' + domain) == 'misskey') {
var misskey = true
var start = 'https://' + domain + '/api/i/notifications'
httpreq.open(POST, start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
var body = JSON.stringify({
i: at,
untilID: sid
});
})
} else {
var misskey = false;
if (localStorage.getItem("exclude-" + tlid)) {
var exc = localStorage.getItem("exclude-" + tlid) + "&max_id=" + sid;
var misskey = false
if (localStorage.getItem('exclude-' + tlid)) {
var exc = localStorage.getItem('exclude-' + tlid) + '&max_id=' + sid
} else {
var exc = "?max_id=" + sid;
var exc = '?max_id=' + sid
}
var start = "https://" + domain + "/api/v1/notifications" + exc;
httpreq.open("GET", start, true);
httpreq.setRequestHeader('Content-Type', 'application/json');
httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
var body = "";
var start = 'https://' + domain + '/api/v1/notifications' + exc
httpreq.open('GET', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
var body = ''
}
httpreq.responseType = "json";
httpreq.send(body);
httpreq.onreadystatechange = function () {
httpreq.responseType = 'json'
httpreq.send(body)
httpreq.onreadystatechange = function() {
if (httpreq.readyState === 4) {
var json = httpreq.response;
console.log(["More notifications on " + tlid, json]);
var max_id = httpreq.getResponseHeader("link").match(/[?&]{1}max_id=([0-9]+)/)[1];
if (json[0]) {
var templete = "";
var lastnotf = localStorage.getItem("lastnotf_" + acct_id);
localStorage.setItem("lastnotf_" + acct_id, json[0].id);
Object.keys(json).forEach(function (key) {
var obj = json[key];
if (localStorage.getItem("filter_" + acct_id) != "undefined") {
var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), "notif");
} else {
var mute = [];
}
if (obj.type != "follow") {
if (misskey) {
templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute);
} else {
templete = templete + parse([obj], 'notf', acct_id, 'notf', -1, mute);
}
} else {
if (misskey) {
templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute);
} else {
templete = templete + userparse([obj.account], 'notf', acct_id, 'notf', -1);
}
}
});
moreloading = false;
templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>';
$("#timeline_" + tlid).append(templete);
$("#landing_" + tlid).hide();
jQuery("time.timeago").timeago();
var json = httpreq.response
if (this.status !== 200) {
setLog(start, this.status, this.response)
}
$("#notf-box").addClass("fetched");
todc();
console.log(['More notifications on ' + tlid, json])
var max_id = httpreq.getResponseHeader('link').match(/[?&]{1}max_id=([0-9]+)/)[1]
if (json[0]) {
var templete = ''
var lastnotf = localStorage.getItem('lastnotf_' + acct_id)
localStorage.setItem('lastnotf_' + acct_id, json[0].id)
Object.keys(json).forEach(function(key) {
var obj = json[key]
var mute = getFilterTypeByAcct(acct_id, 'notif')
if (obj.type != 'follow') {
if (misskey) {
templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute)
} else {
templete = templete + parse([obj], 'notf', acct_id, 'notf', -1, mute)
}
} else {
if (misskey) {
templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
} else {
templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1)
}
}
})
moreloading = false
templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
$('#timeline_' + tlid).append(templete)
$('#landing_' + tlid).hide()
jQuery('time.timeago').timeago()
}
$('#notf-box').addClass('fetched')
todc()
}
}
}
@@ -343,53 +361,59 @@ function notfmore(tlid) {
//通知トグルボタン
function notfToggle(acct, tlid) {
if ($("#notf-box_" + tlid).hasClass("column-hide")) {
$("#notf-box_" + tlid).css("display", "block")
$("#notf-box_" + tlid).animate({
'height': '400px'
}, {
'duration': 300,
'complete': function () {
$("#notf-box_" + tlid).css("overflow-y", "scroll")
$("#notf-box_" + tlid).removeClass("column-hide")
if ($('#notf-box_' + tlid).hasClass('column-hide')) {
$('#notf-box_' + tlid).css('display', 'block')
$('#notf-box_' + tlid).animate(
{
height: '400px'
},
{
duration: 300,
complete: function() {
$('#notf-box_' + tlid).css('overflow-y', 'scroll')
$('#notf-box_' + tlid).removeClass('column-hide')
}
});
}
)
} else {
$("#notf-box_" + tlid).css("overflow-y", "hidden")
$("#notf-box_" + tlid).animate({
'height': '0'
}, {
'duration': 300,
'complete': function () {
$("#notf-box_" + tlid).addClass("column-hide")
$("#notf-box_" + tlid).css("display", "none")
$('#notf-box_' + tlid).css('overflow-y', 'hidden')
$('#notf-box_' + tlid).animate(
{
height: '0'
},
{
duration: 300,
complete: function() {
$('#notf-box_' + tlid).addClass('column-hide')
$('#notf-box_' + tlid).css('display', 'none')
}
});
}
)
}
notfCanceler(acct)
}
function notfCanceler(acct) {
$(".notf-reply_" + acct).text(0);
localStorage.removeItem("notf-reply_" + acct)
$(".notf-reply_" + acct).addClass("hide");
$(".notf-fav_" + acct).text(0);
localStorage.removeItem("notf-fav_" + acct)
$(".notf-fav_" + acct).addClass("hide");
$(".notf-bt_" + acct).text(0);
localStorage.removeItem("notf-bt_" + acct)
$(".notf-bt_" + acct).addClass("hide");
$(".notf-follow_" + acct).text(0);
localStorage.removeItem("notf-follow_" + acct)
$(".notf-follow_" + acct).addClass("hide");
$(".notf-icon_" + acct).removeClass("red-text");
$('.notf-reply_' + acct).text(0)
localStorage.removeItem('notf-reply_' + acct)
$('.notf-reply_' + acct).addClass('hide')
$('.notf-fav_' + acct).text(0)
localStorage.removeItem('notf-fav_' + acct)
$('.notf-fav_' + acct).addClass('hide')
$('.notf-bt_' + acct).text(0)
localStorage.removeItem('notf-bt_' + acct)
$('.notf-bt_' + acct).addClass('hide')
$('.notf-follow_' + acct).text(0)
localStorage.removeItem('notf-follow_' + acct)
$('.notf-follow_' + acct).addClass('hide')
$('.notf-icon_' + acct).removeClass('red-text')
}
function allNotfRead() {
var multi = localStorage.getItem("multi");
var multi = localStorage.getItem('multi')
if (multi) {
var obj = JSON.parse(multi);
Object.keys(obj).forEach(function (key) {
var obj = JSON.parse(multi)
Object.keys(obj).forEach(function(key) {
notfCanceler(key)
});
})
}
}
allNotfRead()
allNotfRead()

View File

@@ -1,249 +1,375 @@
//Integrated TL
function mixtl(acct_id, tlid) {
var type = "mix";
localStorage.removeItem("morelock")
localStorage.setItem("now", type);
todo("Integrated TL Loading...(Local)");
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_"+ acct_id + "_at");
function mixtl(acct_id, tlid, type, delc, voice) {
localStorage.removeItem('morelock')
localStorage.setItem('now', type)
todo('Integrated TL Loading...(Local)')
//まずLocal
var start = "https://" + domain + "/api/v1/timelines/public?local=true";
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/v1/timelines/public?local=true'
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function(response) {
return response.json();
}).catch(function(error) {
todo(error);
console.error(error);
}).then(function(json) {
//パースして描画
var templete = parse(json, 'mix', acct_id, tlid);
$("#timeline_" + tlid).html(templete[0]);
jQuery("time.timeago").timeago();
$(window).scrollTop(0);
var locals = templete[1];
var times = templete[2];
todo("Integrated TL Loading...(Home)");
//Home
var start = "https://" + domain + "/api/v1/timelines/home";
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function(response) {
return response.json();
}).catch(function(error) {
todo(error);
console.error(error);
}).then(function(obj) {
//ホームのオブジェクトをUnix時間で走査
if (!$("[toot-id=" + obj[0].id + "]").length) {
$("#timeline_" + tlid + " .cvo").first().before(parse([obj[0]], 'home',
acct_id));
//delete obj[0];
}
//Localが遅すぎてHomeの全てより過去の場合
var unixL=date(json[0].created_at,"unix");
var unixH=date(obj[obj.length-1].created_at,"unix");
//console.log(unixH+"vs"+unixL)
if(unixH < unixL){
Object.keys(obj).forEach(function(key) {
var skey = obj.length - key - 1;
var toot = obj[key];
console.log(toot);
var id = toot.id;
if ($("#timeline_" + tlid + " [toot-id=" + toot.id + "]").length < 1) {
//console.log(toot.id);
var tarunix = date(toot.created_at, 'unix');
var beforekey2;
var key2;
//console.log(locals)
//ホームのオブジェクトに対してLocalのオブジェクトを時間走査
Object.keys(times).forEach(function(key2) {
if (times[key2] < tarunix) {
var local = json[key2].id;
//console.log($.strip_tags(toot.content));
html = parse(
[toot], 'home', acct_id, tlid);
$("#timeline_" + tlid + " [toot-id=" + local + "]").before(html);
//console.log("#timeline_" + tlid + " [toot-id=" + local + "]");
tarunix = 0;
}
});
}
});
}else{
html = parse(
obj, 'home', acct_id, tlid);
$("#timeline_" + tlid).html(html);
Authorization: 'Bearer ' + at
}
todc();
mixre(acct_id, tlid);
additional(acct_id, tlid);
jQuery("time.timeago").timeago();
});
});
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(jsonL) {
var start = 'https://' + domain + '/api/v1/timelines/home'
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at
}
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(jsonH) {
var homearr = []
var timeline = jsonL.concat(jsonH)
timeline.sort(function(a, b) {
if (date(a.created_at, 'unix') >= date(b.created_at, 'unix')) return -1
if (date(a.created_at, 'unix') < date(b.created_at, 'unix')) return 1
return 0
})
if (type == 'integrated') {
timeline.splice(20)
}
var templete = ''
if (localStorage.getItem('filter_' + acct_id) != 'undefined') {
var mute = getFilterType(JSON.parse(localStorage.getItem('filter_' + acct_id)), 'mix')
} else {
var mute = []
}
Object.keys(timeline).forEach(function(key) {
var pkey = key * 1 + 1
if (pkey < timeline.length) {
if (
date(timeline[key].created_at, 'unix') != date(timeline[pkey].created_at, 'unix')
) {
if (type == 'integrated') {
templete = templete + parse([timeline[key]], '', acct_id, tlid, '', mute, 'mix')
} else if (type == 'plus') {
if (timeline[key].account.acct == timeline[key].account.username) {
templete =
templete + parse([timeline[key]], '', acct_id, tlid, '', mute, 'plus')
}
}
}
}
})
$('#landing_' + tlid).hide()
$('#timeline_' + tlid).html(templete)
mixre(acct_id, tlid, type, mute, delc, voice)
additional(acct_id, tlid)
jQuery('time.timeago').timeago()
todc()
})
})
}
//Streamingに接続
function mixre(acct_id, tlid) {
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_"+ acct_id + "_at");
var type = "mix";
localStorage.setItem("now", type);
var startHome = "wss://" + domain +
"/api/v1/streaming/?stream=user&access_token=" + at;
var startLocal = "wss://" + domain +
"/api/v1/streaming/?stream=public:local&access_token=" + at;
var wshid = websocketHome.length;
var wslid = websocketLocal.length;
websocketHome[wshid] = new WebSocket(startHome);
websocketLocal[wslid] = new WebSocket(startLocal);
function mixre(acct_id, tlid, TLtype, mute, delc, voice, mode) {
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
if (localStorage.getItem('streaming_' + acct_id)) {
var wss = localStorage.getItem('streaming_' + acct_id)
} else {
var wss = 'wss://' + domain
}
var startHome = wss + '/api/v1/streaming/?stream=user&access_token=' + at
var startLocal = wss + '/api/v1/streaming/?stream=public:local&access_token=' + at
var wshid = websocketHome.length
var wslid = websocketLocal.length
websocketHome[wshid] = new WebSocket(startHome)
websocketLocal[wslid] = new WebSocket(startLocal)
websocketHome[wshid].onopen = function(mess) {
console.log("Connect Streaming API(Home)");
$("#notice_icon_" + tlid).removeClass("red-text");
localStorage.setItem('wssH_' + tlid, wshid)
console.table({
tlid: tlid,
type: 'Connect Streaming API(Integrated:Home)',
domain: domain,
message: mess
})
$('#notice_icon_' + tlid).removeClass('red-text')
}
websocketLocal[wslid].onopen = function(mess) {
console.log("Connect Streaming API(Local)");
$("#notice_icon_" + tlid).removeClass("red-text");
localStorage.setItem('wssL_' + tlid, wslid)
console.table({
tlid: tlid,
type: 'Connect Streaming API(Integrated:Local)',
domain: domain,
message: mess
})
$('#notice_icon_' + tlid).removeClass('red-text')
}
websocketLocal[wslid].onmessage = function(mess) {
console.log("Receive Streaming API:");
console.log(['Receive Streaming API:(Integrated:Local)', obj])
var obj = JSON.parse(JSON.parse(mess.data).payload);
console.log(obj);
var type = JSON.parse(mess.data).event;
if (type == "delete") {
$("[toot-id=" + JSON.parse(mess.data).payload + "]").hide();
$("[toot-id=" + JSON.parse(mess.data).payload + "]").remove();
} else if (type == "update") {
var templete = parse([obj], '', acct_id, tlid);
var pool = localStorage.getItem("pool_" + tlid);
var obj = JSON.parse(JSON.parse(mess.data).payload)
var type = JSON.parse(mess.data).event
if (type == 'delete') {
if (delc == 'true') {
$('#timeline_' + tlid + ' [toot-id=' + JSON.parse(mess.data).payload + ']').addClass(
'emphasized'
)
$('#timeline_' + tlid + ' [toot-id=' + JSON.parse(mess.data).payload + ']').addClass(
'by_delcatch'
)
} else {
$('[toot-id=' + JSON.parse(mess.data).payload + ']').hide()
$('[toot-id=' + JSON.parse(mess.data).payload + ']').remove()
}
} else if (type == 'update') {
var templete = parse([obj], '', acct_id, tlid, '', mute)
if ($('#timeline_' + tlid + ' [toot-id=' + obj.id + ']').length < 1) {
if (voice) {
say(obj.content)
}
var templete = parse([obj], type, acct_id, tlid, '', mute, 'mix')
var pool = localStorage.getItem('pool_' + tlid)
if (pool) {
pool = templete + pool;
pool = templete + pool
} else {
pool = templete
}
localStorage.setItem("pool_" + tlid, pool);
scrollck();
additional(acct_id, tlid);
jQuery("time.timeago").timeago();
todc();
localStorage.setItem('pool_' + tlid, pool)
scrollck()
additional(acct_id, tlid)
jQuery('time.timeago').timeago()
} else {
todo('二重取得発生中')
}
}
}
websocketHome[wshid].onmessage = function(mess) {
console.log("Receive Streaming API:(Home)");
var obj = JSON.parse(JSON.parse(mess.data).payload);
console.log(obj);
var type = JSON.parse(mess.data).event;
if (type == "delete") {
$("[toot-id=" + JSON.parse(mess.data).payload + "]").hide();
$("[toot-id=" + JSON.parse(mess.data).payload + "]").remove();
} else if (type == "update") {
var templete = parse([obj], '', acct_id, tlid);
if (obj.visibility != "public" || obj.account.acct != obj.account.username) {
var pool = localStorage.getItem("pool_" + tlid);
console.log(['Receive Streaming API:(Integrated:Home)', obj])
var obj = JSON.parse(JSON.parse(mess.data).payload)
var type = JSON.parse(mess.data).event
if (type == 'delete') {
if (del > 10) {
reconnector(tlid, type, acct_id, data)
} else {
localStorage.setItem('delete', del * 1 + 1)
}
if (delc == 'true') {
$('[toot-id=' + JSON.parse(mess.data).payload + ']').addClass('emphasized')
$('[toot-id=' + JSON.parse(mess.data).payload + ']').addClass('by_delcatch')
} else {
$('[toot-id=' + JSON.parse(mess.data).payload + ']').hide()
$('[toot-id=' + JSON.parse(mess.data).payload + ']').remove()
}
} else if (type == 'update') {
localStorage.removeItem('delete')
if (TLtype == 'integrated') {
var templete = parse([obj], '', acct_id, tlid)
} else if (TLtype == 'plus') {
if (obj.account.acct == obj.account.username) {
var templete = parse([obj], '', acct_id, tlid, '', mute, 'mix')
} else {
var templete = ''
}
}
if ($('#timeline_' + tlid + ' [toot-id=' + obj.id + ']').length < 1) {
if (voice) {
say(obj.content)
}
var templete = parse([obj], type, acct_id, tlid, '', mute, 'mix')
var pool = localStorage.getItem('pool_' + tlid)
if (pool) {
pool = templete + pool;
pool = templete + pool
} else {
pool = templete
}
localStorage.setItem("pool_" + tlid, pool);
scrollck();
additional(acct_id, tlid);
jQuery("time.timeago").timeago();
localStorage.setItem('pool_' + tlid, pool)
scrollck()
additional(acct_id, tlid)
jQuery('time.timeago').timeago()
} else {
todo('二重取得発生中')
}
}
}
websocketLocal[wslid].onerror = function(error) {
console.error('WebSocket Error ' + error);
};
console.error('WebSocketLocal Error')
console.error(error)
if (mode == 'error') {
$('#notice_icon_' + tlid).addClass('red-text')
todo('WebSocket Error ' + error)
} else {
var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
localStorage.setItem('wserror_' + tlid, errorct)
if (errorct < 3) {
reconnector(tlid, TLtype, acct_id, '', 'error')
}
}
}
websocketLocal[wslid].onclose = function() {
console.warn('WebSocketLocal Closing:' + tlid)
if (mode == 'error') {
$('#notice_icon_' + tlid).addClass('red-text')
todo('WebSocket Closed')
} else {
var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
localStorage.setItem('wserror_' + tlid, errorct)
if (errorct < 3) {
reconnector(tlid, TLtype, acct_id, '', 'error')
}
}
}
websocketHome[wshid].onerror = function(error) {
console.error('WebSocket Error ' + error);
};
console.error(['WebSocketHome Error', error])
if (mode == 'error') {
$('#notice_icon_' + tlid).addClass('red-text')
todo('WebSocket Error ' + error)
} else {
var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
localStorage.setItem('wserror_' + tlid, errorct)
if (errorct < 3) {
reconnector(tlid, TLtype, acct_id, '', 'error')
}
}
}
websocketHome[wshid].onclose = function() {
console.warn('WebSocketHome Closing:' + tlid)
if (mode == 'error') {
$('#notice_icon_' + tlid).addClass('red-text')
todo('WebSocket Closed')
} else {
var errorct = localStorage.getItem('wserror_' + tlid) * 1 + 1
localStorage.setItem('wserror_' + tlid, errorct)
if (errorct < 3) {
reconnector(tlid, TLtype, acct_id, '', 'error')
}
}
}
}
//ある程度のスクロールで発火
function mixmore(tlid) {
var multi = localStorage.getItem("column");
var obj = JSON.parse(multi);
var acct_id = obj[tlid].domain;
todo("Integrated TL MoreLoading...(Local)");
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_"+ acct_id + "_at");
var sid = $("#timeline_" + tlid + " .cvo").last().attr("toot-id");
var len = $("#timeline_" + tlid + " .cvo").length
var start = "https://" + domain +
"/api/v1/timelines/public?local=true&max_id=" + sid;
console.log(start);
function mixmore(tlid, type) {
var multi = localStorage.getItem('column')
var obj = JSON.parse(multi)
var acct_id = obj[tlid].domain
moreloading = true
todo('Integrated TL MoreLoading...(Local)')
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var sid = $('#timeline_' + tlid + ' .cvo')
.last()
.attr('unique-id')
var start = 'https://' + domain + '/api/v1/timelines/public?local=true&max_id=' + sid
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function(response) {
return response.json();
}).catch(function(error) {
todo(error);
console.error(error);
}).then(function(json) {
var templete = parse(json, 'mix', acct_id, tlid);
$("#timeline_" + tlid).append(templete[0]);
var locals = templete[1];
todo("Integrated TL MoreLoading...(Home)");
console.log(sid);
var start = "https://" + domain + "/api/v1/timelines/home?max_id=" + sid;
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function(response) {
return response.json();
}).catch(function(error) {
todo(error);
console.error(error);
}).then(function(obj) {
if ($("[toot-id=" + obj[0].id + "]").length < 1) {
$("#timeline_" + tlid + " .cvo").eq(len).before(parse([obj[0]], 'home',
acct_id)+'<div class="divider"></div>');
//delete obj[0];
Authorization: 'Bearer ' + at
}
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
Object.keys(obj).forEach(function(key) {
var skey = obj.length - key - 1;
var toot = obj[skey];
var id = toot.id;
var tarunix = date(toot.created_at, 'unix');
var beforekey2;
var key2;
Object.keys(locals).forEach(function(key2) {
if ($("[toot-id=" + toot.id + "]").length <1) {
if (key2 > tarunix) {
var local = locals[key2];
$("#timeline_" + tlid + " [toot-id=" + local + "]").after(parse([toot], 'home',
acct_id, tlid));
tarunix = 2147483647;
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(jsonL) {
var start = 'https://' + domain + '/api/v1/timelines/home?max_id=' + sid
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at
}
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
});
});
additional(acct_id, tlid);
jQuery("time.timeago").timeago();
todc();
});
});
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(jsonH) {
var homearr = []
var timeline = jsonL.concat(jsonH)
timeline.sort(function(a, b) {
if (date(a.created_at, 'unix') > date(b.created_at, 'unix')) return -1
if (date(a.created_at, 'unix') < date(b.created_at, 'unix')) return 1
return 0
})
timeline.splice(20)
var templete = ''
Object.keys(timeline).forEach(function(key) {
var pkey = key * 1 + 1
if (pkey < 20) {
if (
date(timeline[key].created_at, 'unix') != date(timeline[pkey].created_at, 'unix')
) {
if (localStorage.getItem('filter_' + acct_id) != 'undefined') {
var mute = getFilterType(
JSON.parse(localStorage.getItem('filter_' + acct_id)),
'mix'
)
} else {
var mute = []
}
if (type == 'integrated') {
templete = templete + parse([timeline[key]], '', acct_id, tlid, '', mute, 'mix')
} else if (type == 'plus') {
if (timeline[key].account.acct == timeline[key].account.username) {
templete = templete + parse([timeline[key]], '', acct_id, tlid, '', mute, 'mix')
}
}
}
}
})
}
$('#timeline_' + tlid).append(templete)
additional(acct_id, tlid)
jQuery('time.timeago').timeago()
moreloading = false
todc()
})
})
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,17 +1,37 @@
//アンケートのトグル
function pollToggle() {
if ($("#poll").hasClass("hide")) {
$("#right-side").show()
$("#poll").removeClass("hide")
} else {
$("#right-side").hide()
$("#emoji").addClass("hide")
$("#poll").addClass("hide")
}
if ($('#poll').hasClass('hide')) {
$('#right-side').show()
$('#right-side').css('width', '300px')
$('#left-side').css('width', 'calc(100% - 300px)')
var width = localStorage.getItem('postbox-width')
if (width) {
width = width.replace('px', '') * 1 + 300
} else {
width = 600
}
$('#post-box').css('width', width + 'px')
$('#poll').removeClass('hide')
$('#pollsta').text(lang.lang_yesno)
} else {
$('#right-side').hide()
$('#left-side').css('width', '100%')
$('#right-side').css('width', '300px')
var width = localStorage.getItem('postbox-width')
if (width) {
width = width.replace('px', '') * 1
} else {
width = 300
}
$('#post-box').css('width', width + 'px')
$('#emoji').addClass('hide')
$('#poll').addClass('hide')
$('#pollsta').text(lang.lang_no)
}
}
function pollProviderCk() {
$(".poll-provider").addClass("hide");
$("#" + $("#poll-sel").val()).removeClass("hide");
$('.poll-provider').addClass('hide')
$('#' + $('#poll-sel').val()).removeClass('hide')
}
/*
function pollAddtime(num){
@@ -22,97 +42,86 @@ function pollAddtime(num){
}
*/
function pollCalc() {
var days = $("#days_poll").val();
var hrs = $("#hours_poll").val();
var mins = $("#mins_poll").val();
console.log("Poll calc:" + days * 86400 + hrs * 3600 + mins * 60)
return days * 86400 + hrs * 3600 + mins * 60;
var days = $('#days_poll').val()
var hrs = $('#hours_poll').val()
var mins = $('#mins_poll').val()
console.log('Poll calc:' + days * 86400 + hrs * 3600 + mins * 60)
return days * 86400 + hrs * 3600 + mins * 60
}
//Vote
function voteSelMastodon(acct_id, id, to, mul) {
if ($('.vote_' + acct_id + '_' + id + '_' + to).hasClass("sel")) {
$('.vote_' + acct_id + '_' + id + '_' + to).css("background-color", "transparent")
$('.vote_' + acct_id + '_' + id + '_' + to).removeClass("sel");
} else {
if (!mul) {
$('.vote_' + acct_id + '_' + id + ' div').each(function (i, elem) {
if (i == to) {
$(this).css("background-color", "var(--emphasized)");
$(this).addClass("sel");
} else {
$(this).css("background-color", "transparent")
$(this).removeClass("sel");
}
});
} else {
$('.vote_' + acct_id + '_' + id + '_' + to).css("background-color", "var(--emphasized)")
$('.vote_' + acct_id + '_' + id + '_' + to).addClass("sel");
}
}
if ($('.vote_' + acct_id + '_' + id + '_' + to).hasClass('sel')) {
$('.vote_' + acct_id + '_' + id + '_' + to).css('background-color', 'transparent')
$('.vote_' + acct_id + '_' + id + '_' + to).removeClass('sel')
} else {
if (!mul) {
$('.vote_' + acct_id + '_' + id + ' div').each(function(i, elem) {
if (i == to) {
$(this).css('background-color', 'var(--emphasized)')
$(this).addClass('sel')
} else {
$(this).css('background-color', 'transparent')
$(this).removeClass('sel')
}
})
} else {
$('.vote_' + acct_id + '_' + id + '_' + to).css('background-color', 'var(--emphasized)')
$('.vote_' + acct_id + '_' + id + '_' + to).addClass('sel')
}
}
}
function voteMastodon(acct_id, id) {
var choice = [];
$('.vote_' + acct_id + '_' + id + ' div').each(function (i, elem) {
if ($(this).hasClass("sel")) {
choice.push(i + "");
}
});
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/v1/polls/" + id + "/votes";
if (localStorage.getItem("mode_" + domain) == "misskey") {
return false;
}
var httpreq = new XMLHttpRequest();
httpreq.open('POST', start, true);
httpreq.setRequestHeader('Content-Type', 'application/json');
httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
httpreq.responseType = "json";
httpreq.send(JSON.stringify({ choices: choice }));
httpreq.onreadystatechange = function () {
voteMastodonrefresh(acct_id, id)
}
var choice = []
$('.vote_' + acct_id + '_' + id + ' div').each(function(i, elem) {
if ($(this).hasClass('sel')) {
choice.push(i + '')
}
})
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/v1/polls/' + id + '/votes'
if (localStorage.getItem('mode_' + domain) == 'misskey') {
return false
}
var httpreq = new XMLHttpRequest()
httpreq.open('POST', start, true)
httpreq.setRequestHeader('Content-Type', 'application/json')
httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
httpreq.responseType = 'json'
httpreq.send(JSON.stringify({ choices: choice }))
httpreq.onreadystatechange = function() {
voteMastodonrefresh(acct_id, id)
}
}
function showResult(acct_id, id) {
$('.vote_' + acct_id + '_' + id + '_result').toggleClass("hide")
$('.vote_' + acct_id + '_' + id + '_result').toggleClass('hide')
}
function voteMastodonrefresh(acct_id, id) {
var datetype = localStorage.getItem("datetype");
if (!datetype) {
datetype = "absolute";
}
var httpreqd = new XMLHttpRequest();
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/v1/polls/" + id;
httpreqd.open('GET', start, true);
httpreqd.setRequestHeader('Content-Type', 'application/json');
httpreqd.responseType = 'json';
httpreqd.send(JSON.stringify({ i: at, noteId: id }));
httpreqd.onreadystatechange = function () {
if (httpreqd.readyState == 4) {
var json = httpreqd.response;
console.log(["Refresh vote", json]);
if (!json) {
return false;
}
var poll = "";
var choices = json.options;
var myvote = lang.lang_parse_voted;
var result_hide = "";
Object.keys(choices).forEach(function (keyc) {
var choice = choices[keyc];
if (!json.voted) {
votesel = 'voteSelMastodon(\'' + acct_id + '\',\'' + json.id + '\',' + keyc + ',' + json.multiple + ')';
}
poll = poll + '<div class="pointer vote vote_' + acct_id + '_' + json.id + '_' + keyc + '" onclick="' + votesel + '">' + escapeHTML(choice.title) + '<span class="vote_' + acct_id + '_' + json.id + '_result ' + result_hide + '">(' + choice.votes_count + ')</span></div>';
});
poll = poll + myvote + '<span class="cbadge cbadge-hover" title="' + date(json.expires_at, 'absolute') +
'"><i class="far fa-calendar-times"></i>' +
date(json.expires_at, datetype) + '</span>';
$('.vote_' + acct_id + '_' + json.id).html(poll)
}
}
}
var datetype = localStorage.getItem('datetype')
if (!datetype) {
datetype = 'absolute'
}
var httpreqd = new XMLHttpRequest()
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/v1/polls/' + id
httpreqd.open('GET', start, true)
httpreqd.setRequestHeader('Content-Type', 'application/json')
httpreqd.setRequestHeader('Authorization', 'Bearer ' + at)
httpreqd.responseType = 'json'
httpreqd.send()
httpreqd.onreadystatechange = function() {
if (httpreqd.readyState == 4) {
if (this.status !== 200) {
setLog(start, this.status, this.response)
}
var json = httpreqd.response
console.log(['Refresh vote', json])
if (!json) {
return false
}
var poll = pollParse(json, acct_id, json.emojis)
$('.vote_' + acct_id + '_' + json.id).html(poll)
}
}
}

View File

@@ -1,108 +1,183 @@
$voise = null;
$voiseName = lang.lang_speech;
$voices = speechSynthesis.getVoices();
$synthes = new SpeechSynthesisUtterance();
$voise = $.grep($voices, function (n, i) { return n.name == $voiseName })[0];
$synthes.voice = $voise; // 音声の設定
localStorage.removeItem("voicebank");
$voise = null
isBouyomi = localStorage.getItem('voice_bouyomi')
$voiseName = lang.lang_speech
$voices = speechSynthesis.getVoices()
$synthes = new SpeechSynthesisUtterance()
$voise = $.grep($voices, function(n, i) {
return n.name == $voiseName
})[0]
$synthes.voice = $voise // 音声の設定
localStorage.removeItem('voicebank')
speechSynthesis.cancel()
if (!localStorage.getItem("voice_vol")) {
localStorage.setItem("voice_vol", 1)
if (!localStorage.getItem('voice_vol')) {
localStorage.setItem('voice_vol', 1)
}
$synthes.rate = localStorage.getItem("voice_speed");
$synthes.pitch = localStorage.getItem("voice_pitch");
$synthes.volume = localStorage.getItem("voice_vol");
voiceRate = localStorage.getItem('voice_speed')
$synthes.rate = voiceRate
voicePitch = localStorage.getItem('voice_pitch')
$synthes.pitch = voicePitch
voiceVol = localStorage.getItem('voice_vol')
$synthes.volume = voiceVol
function say(msgr) {
msg = voiceParse(msgr);
var voice = localStorage.getItem("voicebank");
var obj = JSON.parse(voice);
if (!obj) {
var json = JSON.stringify([msg]);
localStorage.setItem("voicebank", json);
} else {
obj.push([msg]);
var json = JSON.stringify(obj);
localStorage.setItem("voicebank", json);
}
msg = voiceParse(msgr)
var voice = localStorage.getItem('voicebank')
var obj = JSON.parse(voice)
if (!obj) {
var json = JSON.stringify([msg])
localStorage.setItem('voicebank', json)
} else {
obj.push([msg])
var json = JSON.stringify(obj)
localStorage.setItem('voicebank', json)
}
}
$repeat = setInterval(function () {
if (!speechSynthesis.speaking) {
var voice = localStorage.getItem("voicebank");
if (voice) {
var obj = JSON.parse(voice);
if (obj[0]) {
$synthes.text = obj[0];
speechSynthesis.speak($synthes);
obj.splice(0, 1);
var json = JSON.stringify(obj);
localStorage.setItem("voicebank", json);
}
}
}
}, 300);
$repeat = setInterval(function() {
if (!speechSynthesis.speaking) {
var voice = localStorage.getItem('voicebank')
if (voice) {
var obj = JSON.parse(voice)
if (obj[0]) {
if (localStorage.getItem('voice_bouyomi')) {
var delim = '<bouyomi>'
var thisVoiceRate = voiceRate * 10 + 70
var thisVoicePitch = voicePitch * 50 + 70
var thisVoiceVol = voiceVol * 100
console.log(thisVoiceRate, thisVoicePitch, thisVoiceVol)
var command = 0x0001
var type = 0
var sends =
'' +
command +
delim +
thisVoiceRate +
delim +
thisVoicePitch +
delim +
thisVoiceVol +
delim +
type +
delim +
obj[0]
bouyomiConnect(sends)
} else {
$synthes.text = obj[0]
speechSynthesis.speak($synthes)
}
obj.splice(0, 1)
var json = JSON.stringify(obj)
localStorage.setItem('voicebank', json)
}
}
}
}, 300)
function voiceParse(msg) {
msg = $.strip_tags(msg);
msg = msg.replace(/#/g, "");
msg = msg.replace(/'/g, "");
msg = msg.replace(/"/g, "");
msg = msg.replace(/https?:\/\/[a-zA-Z0-9./-@_=?%&-]+/g, "");
return msg;
msg = $.strip_tags(msg)
msg = msg.replace(/#/g, '')
msg = msg.replace(/'/g, '')
msg = msg.replace(/"/g, '')
msg = msg.replace(/https?:\/\/[a-zA-Z0-9./-@_=?%&-]+/g, '')
return msg
}
function voiceToggle(tlid) {
var voiceck = localStorage.getItem("voice_" + tlid);
if (voiceck) {
localStorage.removeItem("voice_" + tlid);
speechSynthesis.cancel()
$("#sta-voice-" + tlid).text("Off");
$("#sta-voice-" + tlid).css("color", 'red');
parseColumn();
} else {
localStorage.setItem("voice_" + tlid, "true");
$("#sta-voice-" + tlid).text("On");
$("#sta-voice-" + tlid).css("color", '#009688');
parseColumn();
}
var voiceck = localStorage.getItem('voice_' + tlid)
if (voiceck) {
localStorage.removeItem('voice_' + tlid)
speechSynthesis.cancel()
if (localStorage.getItem('voice_bouyomi')) {
var command = 0x0010
var sends = '' + command
bouyomiConnect(sends)
}
$('#sta-voice-' + tlid).text('Off')
$('#sta-voice-' + tlid).css('color', 'red')
parseColumn(tlid)
} else {
localStorage.setItem('voice_' + tlid, 'true')
$('#sta-voice-' + tlid).text('On')
$('#sta-voice-' + tlid).css('color', '#009688')
parseColumn(tlid)
}
}
function voiceCheck(tlid) {
var voiceck = localStorage.getItem("voice_" + tlid);
if (voiceck) {
$("#sta-voice-" + tlid).text("On");
$("#sta-voice-" + tlid).css("color", '#009688');
} else {
$("#sta-voice-" + tlid).text("Off");
$("#sta-voice-" + tlid).css("color", 'red');
}
var voiceck = localStorage.getItem('voice_' + tlid)
if (voiceck) {
$('#sta-voice-' + tlid).text('On')
$('#sta-voice-' + tlid).css('color', '#009688')
} else {
$('#sta-voice-' + tlid).text('Off')
$('#sta-voice-' + tlid).css('color', 'red')
}
}
function voicePlay() {
if (speechSynthesis.speaking) {
speechSynthesis.cancel()
} else {
$synthes.text = $("#voicetxt").val();
$synthes.rate = $("#voicespeed").val() / 10;
$synthes.pitch = $("#voicepitch").val() / 50;
$synthes.volume = $("#voicevol").val() / 100;
speechSynthesis.speak($synthes);
}
if (speechSynthesis.speaking) {
speechSynthesis.cancel()
} else {
var text = $('#voicetxt').val()
var rate = $('#voicespeed').val()
var pitch = $('#voicepitch').val()
var vol = $('#voicevol').val()
if (localStorage.getItem('voice_bouyomi')) {
var delim = '<bouyomi>'
rate = rate * 1 + 70
pitch = pitch * 1 + 70
var command = 0x0001 // コマンドです。0x0001.読み上げ/0x0010.ポーズ/0x0020.再開/0x0030.スキップ
/*var speed = 100; // 速度50-200。-1を指定すると本体設定
var pitch = 100; // ピッチ50-200。-1を指定すると本体設定
var volume = 100; // ボリューム0-100。-1を指定すると本体設定*/
var type = 0 // 声質(0.本体設定/1.女性1/2.女性2/3.男性1/4.男性2/5.中性/6.ロボット/7.機械1/8.機械2)
var sends =
'' + command + delim + rate + delim + pitch + delim + vol + delim + type + delim + text
bouyomiConnect(sends)
} else {
$synthes.text = text
$synthes.rate = rate / 10
$synthes.pitch = pitch / 50
$synthes.volume = vol / 100
speechSynthesis.speak($synthes)
}
}
}
function voiceSettings() {
localStorage.setItem("voice_speed", $("#voicespeed").val() / 10);
localStorage.setItem("voice_pitch", $("#voicepitch").val() / 50);
localStorage.setItem("voice_vol", $("#voicevol").val() / 100);
M.toast({ html: lang.lang_speech_refresh, displayLength: 3000 })
var awk = $('[name=bym]:checked').val()
if (awk == 'yes') {
localStorage.setItem('voice_bouyomi', 'yes')
M.toast({ html: 'Bouyomi Chan connection requires WebSocket Plugin', displayLength: 3000 })
} else {
localStorage.removeItem('voice_bouyomi')
}
localStorage.setItem('voice_speed', $('#voicespeed').val() / 10)
localStorage.setItem('voice_pitch', $('#voicepitch').val() / 50)
localStorage.setItem('voice_vol', $('#voicevol').val() / 100)
M.toast({ html: lang.lang_speech_refresh, displayLength: 3000 })
}
function voiceSettingLoad() {
var speed = localStorage.getItem("voice_speed");
var pitch = localStorage.getItem("voice_pitch");
var vol = localStorage.getItem("voice_vol");
if (speed) {
$("#voicespeed").val(speed * 10);
}
if (pitch) {
$("#voicepitch").val(pitch * 50);
}
if (vol) {
$("#voicevol").val(vol * 100);
}
}
var flag = localStorage.getItem('voice_bouyomi')
if (flag) {
$('#bym_yes').prop('checked', true)
} else {
$('#bym_no').prop('checked', true)
}
var speed = localStorage.getItem('voice_speed')
var pitch = localStorage.getItem('voice_pitch')
var vol = localStorage.getItem('voice_vol')
if (speed) {
$('#voicespeed').val(speed * 10)
$('#voicespeedVal').text(speed * 10)
}
if (pitch) {
$('#voicepitch').val(pitch * 50)
$('#voicepitchVal').text(pitch * 50)
}
if (vol) {
$('#voicevol').val(vol * 100)
$('#voicevolVal').text(vol * 100)
}
}
function bouyomiConnect(sends) {
var socket = new WebSocket('ws://localhost:50002/')
socket.onopen = function() {
socket.send(sends)
}
}

View File

@@ -1,195 +1,310 @@
//検索
//検索ボックストグル
function searchMenu() {
$("#left-menu div").removeClass("active");
$("#searchMenu").addClass("active");
$(".menu-content").addClass("hide");
$("#src-box").removeClass("hide");
$('ul.tabs').tabs('select_tab', 'src-sta');
$("#src-contents").html("");
$('#src-contents').html('')
trend()
$('#left-menu div').removeClass('active')
$('#searchMenu').addClass('active')
$('.menu-content').addClass('hide')
$('#src-box').removeClass('hide')
//$('ul.tabs').tabs('select_tab', 'src-sta');
}
//検索取得
function src(mode) {
$("#src-contents").html("");
var q = $("#src").val();
var acct_id = $("#src-acct-sel").val();
if (acct_id == "tootsearch") {
tsAdd(q)
return false;
function src(mode, offset) {
if (!offset) {
$('#src-contents').html('')
var add = ''
} else {
var add = '&type=accounts&offset=' + $('#src-accts .cvo').length
}
localStorage.setItem("last-use", acct_id);
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
var m = q.match(/^#(.+)$/);
if (m) { q = m[1]; }
if (user == "--now") {
var user = $('#his-data').attr("user-id");
var q = $('#src').val()
var acct_id = $('#src-acct-sel').val()
if (acct_id == 'tootsearch') {
tsAdd(q)
return false
}
localStorage.setItem('last-use', acct_id)
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var m = q.match(/^#(.+)$/)
if (m) {
q = m[1]
}
if (user == '--now') {
var user = $('#his-data').attr('user-id')
}
if (!mode) {
var start = "https://" + domain + "/api/v2/search?q=" + q
var start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + q + add
} else {
var start = "https://" + domain + "/api/v1/search?q=" + q
var start = 'https://' + domain + '/api/v1/search?q=' + q
}
console.log("Try to search at " + start)
console.log('Try to search at ' + start)
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
src("v1")
return false;
}).then(function (json) {
console.log(["Search", json]);
//ハッシュタグ
if (json.hashtags[0]) {
var tags = "";
Object.keys(json.hashtags).forEach(function (key4) {
var tag = json.hashtags[key4];
if (mode) {
tags = tags + '<a onclick="tl(\'tag\',\'' + tag + '\',\'' + acct_id +
'\',\'add\')" class="pointer">#' + escapeHTML(tag) + '</a><br> ';
Authorization: 'Bearer ' + at
}
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
src('v1')
return false
})
.then(function(json) {
console.log(['Search', json])
//ハッシュタグ
if (json.hashtags[0]) {
var tags = ''
Object.keys(json.hashtags).forEach(function(key4) {
var tag = json.hashtags[key4]
if (mode) {
tags =
tags +
`<a onclick="tl('tag','${tag}','${acct_id}','add')" class="pointer">
#${escapeHTML(tag)}
</a>
<br> `
} else {
tags = tags + graphDraw(tag, acct_id)
}
})
$('#src-contents').append('Tags<br>' + tags)
}
//トゥート
if (json.statuses[0]) {
var templete = parse(json.statuses, '', acct_id)
$('#src-contents').append('<br>Mentions<br>' + templete)
}
//アカウント
if (json.accounts[0]) {
var templete = userparse(json.accounts, '', acct_id)
if (!offset) {
$('#src-contents').append(
`<br>Accounts<div id="src-accts">
${templete}
</div><a onclick="src(false,'more')" class="pointer">more...</a>`
)
} else {
tags = tags + graphDraw(tag, acct_id);
$('#src-accts').append(templete)
}
});
$("#src-contents").append("Tags<br>" + tags);
}
//トゥート
if (json.statuses[0]) {
var templete = parse(json.statuses, '', acct_id);
$("#src-contents").append("<br>Mentions<br>" + templete);
}
//アカウント
if (json.accounts[0]) {
var templete = userparse(json.accounts, '', acct_id);
$("#src-contents").append("<br>Accounts<br>" + templete);
}
jQuery("time.timeago").timeago();
});
}
jQuery('time.timeago').timeago()
})
}
function tsAdd(q) {
var add = {
domain: acct_id,
type: "tootsearch",
type: 'tootsearch',
data: q
};
var multi = localStorage.getItem("column");
var obj = JSON.parse(multi);
localStorage.setItem("card_" + obj.length, "true");
obj.push(add);
var json = JSON.stringify(obj);
localStorage.setItem("column", json);
parseColumn();
}
var multi = localStorage.getItem('column')
var obj = JSON.parse(multi)
localStorage.setItem('card_' + obj.length, 'true')
obj.push(add)
var json = JSON.stringify(obj)
localStorage.setItem('column', json)
parseColumn('add')
}
function tootsearch(tlid, q) {
var start = "https://tootsearch.chotto.moe/api/v1/search?from=0&sort=created_at%3Adesc&q=" + q
console.log("Toot srrach at " + start)
$("#notice_" + tlid).text("tootsearch(" + q + ")");
$("#notice_icon_" + tlid).text("search");
var start = 'https://tootsearch.chotto.moe/api/v1/search?from=0&sort=created_at%3Adesc&q=' + q
console.log('Toot srrach at ' + start)
$('#notice_' + tlid).text('tootsearch(' + q + ')')
$('#notice_icon_' + tlid).text('search')
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json'
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (raw) {
var templete = "";
var json = raw.hits.hits;
var max_id = raw["hits"].length;
for (var i = 0; i < json.length; i++) {
var toot = json[i]["_source"];
if (lastid != toot.uri) {
if (toot && toot.account) {
templete = templete + parse([toot], "noauth", null, tlid, 0, [], "tootsearch")
}
}
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
var lastid = toot.uri;
}
if (!templete) {
templete = lang.lang_details_nodata;
} else {
templete = templete + '<div class="hide ts-marker" data-maxid="' + max_id + '"></div>';
}
$("#timeline_" + tlid).html(templete);
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(raw) {
var templete = ''
var json = raw.hits.hits
var max_id = raw['hits'].length
for (var i = 0; i < json.length; i++) {
var toot = json[i]['_source']
if (lastid != toot.uri) {
if (toot && toot.account) {
templete = templete + parse([toot], 'noauth', null, tlid, 0, [], 'tootsearch')
}
}
var lastid = toot.uri
}
if (!templete) {
templete = lang.lang_details_nodata
} else {
templete = templete + `<div class="hide ts-marker" data-maxid="${max_id}"></div>`
}
$('#timeline_' + tlid).html(templete)
jQuery("time.timeago").timeago();
});
jQuery('time.timeago').timeago()
})
}
function moreTs(tlid, q) {
var sid = $("#timeline_" + tlid + " .ts-marker").last().attr("data-maxid");
moreloading = true;
var start = "https://tootsearch.chotto.moe/api/v1/search?from=" + sid + "&sort=created_at%3Adesc&q=" + q
$("#notice_" + tlid).text("tootsearch(" + q + ")");
$("#notice_icon_" + tlid).text("search");
var sid = $('#timeline_' + tlid + ' .ts-marker')
.last()
.attr('data-maxid')
moreloading = true
var start =
'https://tootsearch.chotto.moe/api/v1/search?from=' + sid + '&sort=created_at%3Adesc&q=' + q
$('#notice_' + tlid).text('tootsearch(' + q + ')')
$('#notice_icon_' + tlid).text('search')
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json'
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (raw) {
var templete = "";
var json = raw.hits.hits;
var max_id = raw["hits"].length;
for (var i = 0; i < json.length; i++) {
var toot = json[i]["_source"];
if (lastid != toot.uri) {
if (toot && toot.account) {
templete = templete + parse([toot], "noauth", null, tlid, 0, [], "tootsearch")
}
}
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
var lastid = toot.uri;
}
if (!templete) {
templete = lang.lang_details_nodata;
} else {
templete = templete + '<div class="hide ts-marker" data-maxid="' + max_id + '"></div>';
}
$("#timeline_" + tlid).append(templete);
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(raw) {
var templete = ''
var json = raw.hits.hits
var max_id = raw['hits'].length
for (var i = 0; i < json.length; i++) {
var toot = json[i]['_source']
if (lastid != toot.uri) {
if (toot && toot.account) {
templete = templete + parse([toot], 'noauth', null, tlid, 0, [], 'tootsearch')
}
}
var lastid = toot.uri
}
if (!templete) {
templete = lang.lang_details_nodata
} else {
templete = templete + `<div class="hide ts-marker" data-maxid="${max_id}"></div>`
}
$('#timeline_' + tlid).append(templete)
jQuery("time.timeago").timeago();
});
jQuery('time.timeago').timeago()
})
}
function graphDraw(tag, acct_id) {
var tags = "";
var his = tag.history;
var max = Math.max.apply(null, [his[0].uses, his[1].uses, his[2].uses, his[3].uses, his[4].uses, his[5].uses, his[6].uses]);
var six = 50 - (his[6].uses / max * 50);
var five = 50 - (his[5].uses / max * 50);
var four = 50 - (his[4].uses / max * 50);
var three = 50 - (his[3].uses / max * 50);
var two = 50 - (his[2].uses / max * 50);
var one = 50 - (his[1].uses / max * 50);
var zero = 50 - (his[0].uses / max * 50);
if (max === 0) {
tags = '<br><br><svg version="1.1" viewbox="0 0 60 50" width="60" height="50">' +
'</svg><span style="font-size:200%">' + his[0].uses + '</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + escapeHTML(tag.name) + '\',\'' + acct_id +
'\',\'add\')" class="pointer">#' + escapeHTML(tag.name) + '</a>&nbsp;' + his[0].accounts + lang.lang_src_people;
} else {
tags = '<br><br><svg version="1.1" viewbox="0 0 60 50" width="60" height="50">' +
'<g><path d="M0,' + six + ' L10,' + five + ' 20,' + four + ' 30,' + three + ' 40,' + two + ' 50,' + one + ' 60,' + zero + '" style="stroke: #9e9e9e; stroke-width: 1;fill: none;"></path></g>' +
'</svg><span style="font-size:200%">' + his[0].uses + '</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + escapeHTML(tag.name) + '\',\'' + acct_id +
'\',\'add\')" class="pointer">#' + escapeHTML(tag.name) + '</a>&nbsp;' + his[0].accounts + lang.lang_src_people;
}
return tags;
var tags = ''
var his = tag.history
return graphDrawCore(his, tag)
}
function graphDrawCore(his, tag){
var max = Math.max.apply(null, [
his[0].uses,
his[1].uses,
his[2].uses,
his[3].uses,
his[4].uses,
his[5].uses,
his[6].uses
])
var six = 50 - (his[6].uses / max) * 50
var five = 50 - (his[5].uses / max) * 50
var four = 50 - (his[4].uses / max) * 50
var three = 50 - (his[3].uses / max) * 50
var two = 50 - (his[2].uses / max) * 50
var one = 50 - (his[1].uses / max) * 50
var zero = 50 - (his[0].uses / max) * 50
return `<div class="tagComp">
<div class="tagCompSvg">
<svg version="1.1" viewbox="0 0 60 50" width="60" height="50">
<g>
<path d="M0,${six} L10,${five} 20,${four} 30,${three} 40,${two} 50,${one} 60,${zero} 61,61 0,61"
style="stroke: #0f8c0c;fill: rgba(13,113,19,.25); stroke-width: 1;">
</path>
</g>
</svg>
</div>
<div class="tagCompToot">
<span style="font-size:200%">${his[0].uses}</span>
</div>
<div class="tagCompToots">
toot
</div>
<div class="tagCompTag">
<a onclick="tl('tag','${escapeHTML(tag.name)}','${acct_id}','add')" class="pointer" title="${escapeHTML(tag.name)}">
#${escapeHTML(tag.name)}
</a>
</div>
<div class="tagCompUser">
${his[0].accounts}
${lang.lang_src_people}
</div>
</div>`
}
/*
<svg version="1.1" viewbox="0 0 50 300" width="100%" height="50">
<path d="M0,0 L10,0 20,10 20,50" fill="#3F51B5"></path>
</svg>
*/
*/
function trend() {
console.log('get trend')
$('#src-contents').html('')
var acct_id = $('#src-acct-sel').val()
if (acct_id == 'tootsearch') {
return false
}
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/v1/trends'
console.log(start)
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at
}
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
var tags = ''
Object.keys(json).forEach(function(keye) {
var tag = json[keye]
var his = tag.history
tags = graphDrawCore(his, tag)
$('#src-contents').append(tags)
})
})
}

View File

@@ -1,130 +1,200 @@
//タグ表示
if (location.search) {
var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
var mode = m[1];
var codex = m[2];
if (mode == "tag") {
var acct_id = localStorage.getItem("main");
tl('tag', decodeURI(codex), acct_id, 'add');
}
var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
var mode = m[1]
var codex = m[2]
if (mode == 'tag') {
var acct_id = localStorage.getItem('main')
tl('tag', decodeURI(codex), acct_id, 'add')
}
}
//よく使うタグ
function tagShow(tag) {
$("[data-tag=" + decodeURI(tag) + "]").toggleClass("hide");
console.log('[data-regTag=' + decodeURI(tag).toLowerCase() + ']')
$('[data-regTag=' + decodeURI(tag).toLowerCase() + ']').toggleClass('hide')
}
//タグ追加
function tagPin(tag) {
var tags = localStorage.getItem("tag");
if (!tags) {
var obj = [];
} else {
var obj = JSON.parse(tags);
}
var can;
Object.keys(obj).forEach(function (key) {
var tagT = obj[key];
if (tagT == tag) {
can = true;
} else {
can = false;
}
});
if (!can) {
obj.push(tag);
}
var json = JSON.stringify(obj);
localStorage.setItem("tag", json);
favTag();
var tags = localStorage.getItem('tag')
if (!tags) {
var obj = []
} else {
var obj = JSON.parse(tags)
}
var can
Object.keys(obj).forEach(function(key) {
var tagT = obj[key]
if (tagT == tag) {
can = true
} else {
can = false
}
})
if (!can) {
obj.push(tag)
}
var json = JSON.stringify(obj)
localStorage.setItem('tag', json)
favTag()
}
//タグ削除
function tagRemove(key) {
var tags = localStorage.getItem("tag");
var obj = JSON.parse(tags);
obj.splice(key, 1);
var json = JSON.stringify(obj);
localStorage.setItem("tag", json);
favTag();
var tags = localStorage.getItem('tag')
var obj = JSON.parse(tags)
obj.splice(key, 1)
var json = JSON.stringify(obj)
localStorage.setItem('tag', json)
favTag()
}
function favTag() {
$("#taglist").html("");
var tagarr = localStorage.getItem("tag");
if (!tagarr) {
var obj = [];
} else {
var obj = JSON.parse(tagarr);
}
var tags = "";
var nowPT = localStorage.getItem("stable")
Object.keys(obj).forEach(function (key) {
var tag = obj[key];
if (nowPT != tag) {
console.log("stable tags:" + nowPT + "/" + tag);
var ptt = lang.lang_tags_realtime;
var nowon = "";
} else {
var ptt = lang.lang_tags_unrealtime;
var nowon = "(" + lang.lang_tags_realtime + ")";
}
tag = escapeHTML(tag);
tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a>' + nowon + '<span class="hide" data-tag="' + tag + '"> <a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="' + lang.lang_parse_tagTL.replace("{{tag}}", '#' + tag) + '">TL</a> <a onclick="brInsert(\'#' + tag + '\')" class="pointer" title="' + lang.lang_parse_tagtoot.replace("{{tag}}", '#' + tag) + '">Toot</a> ' +
'<a onclick="autoToot(\'' + tag + '\');" class="pointer" title="' + lang.lang_tags_always + lang.lang_parse_tagtoot.replace("{{tag}}", '#' + tag) + '">' + ptt + '</a> <a onclick="tagRemove(\'' + key + '\')" class="pointer" title="' + lang.lang_tags_tagunpin.replace("{{tag}}", '#' + tag) + '">' + lang.lang_del + '</a></span> ';
});
if (obj.length > 0) {
$("#taglist").append("My Tags:" + tags);
} else {
$("#taglist").append("");
}
$('#taglist').html('')
var tagarr = localStorage.getItem('tag')
if (!tagarr) {
var obj = []
} else {
var obj = JSON.parse(tagarr)
}
var tags = ''
var nowPT = localStorage.getItem('stable')
Object.keys(obj).forEach(function(key) {
var tag = obj[key]
if (nowPT != tag) {
console.log('stable tags:' + nowPT + '/' + tag)
var ptt = lang.lang_tags_realtime
var nowon = ''
} else {
var ptt = lang.lang_tags_unrealtime
var nowon = '(' + lang.lang_tags_realtime + ')'
}
tag = escapeHTML(tag)
tags =
tags +
`<a onclick="tagShow('${tag}')" class="pointer">#${tag}</a>
${nowon}<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}"> 
<a onclick=\"tagTL('tag','${tag}',false,'add')" class="pointer" title="${lang.lang_parse_tagTL.replace('{{tag}}', '#' + tag)}">
TL
</a> 
<a onclick="brInsert('#${tag}')" class="pointer" title="${lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag)}">
Toot
</a> 
<a onclick="autoToot('${tag}');" class="pointer" title="${lang.lang_tags_always}${lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag)}">
${ptt}
</a> 
<a onclick="tagRemove('${key}')" class="pointer" title="${lang.lang_tags_tagunpin.replace('{{tag}}', '#' + tag)}">
${lang.lang_del}
</a>
</span> `
})
if (obj.length > 0) {
$('#taglist').append('My Tags:' + tags)
} else {
$('#taglist').append('')
}
}
function trendTag() {
$(".trendtag").remove();
var domain = "imastodon.net"
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/v1/trend_tags"
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
if (json) {
var tags = "";
json = json.score;
Object.keys(json).forEach(function (tag) {
tag = escapeHTML(tag);
tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a><span class="hide" data-tag="' + tag + '"> <a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="#' + tag + 'のタイムライン">TL</a> <a onclick="show();brInsert(\'#' + tag + '\')" class="pointer" title="#' + tag + 'でトゥート">Toot</a></span> ';
});
$("#taglist").append('<div class="trendtag">アイマストドントレンドタグ<i class="material-icons pointer" onclick="trendTag()" style="font-size:12px">refresh</i>:' + tags + '</div>');
trendintervalset()
} else {
$("#taglist").html("");
}
});
$('.trendtag').remove()
var domain = 'imastodon.net'
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/v1/trend_tags'
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at
}
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
if (json) {
var tags = ''
json = json.score
Object.keys(json).forEach(function(tag) {
tag = escapeHTML(tag)
tags =
tags +
`<a onclick="tagShow('${tag}')" class="pointer">#${tag}</a>
<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}"> 
<a onclick=\"tagTL('tag','${tag}',false,'add')" class="pointer" title="#${tag}のタイムライン">TL</a> 
<a onclick="show();brInsert('#${tag}')" class="pointer" title="#${tag}でトゥート">
Toot
</a>
</span> `
})
$('#taglist').append(
'<div class="trendtag">アイマストドントレンドタグ<i class="material-icons pointer" onclick="trendTag()" style="font-size:12px">refresh</i>:' +
tags +
'</div>'
)
trendintervalset()
} else {
$('#taglist').html('')
}
})
}
function trendintervalset() {
setTimeout(trendTag, 6000000);
setTimeout(trendTag, 6000000)
}
function tagTL(a, b, c, d) {
var acct_id = $("#post-acct-sel").val();
tl(a, b, acct_id, d);
var acct_id = $('#post-acct-sel').val()
tl(a, b, acct_id, d)
}
function autoToot(tag) {
tag = escapeHTML(tag)
var nowPT = localStorage.getItem("stable")
if (nowPT == tag) {
localStorage.removeItem("stable");
M.toast({ html: lang.lang_tags_unrealtime, displayLength: 3000 })
} else {
localStorage.setItem("stable", tag);
M.toast({ html: lang.lang_tags_tagwarn.replace("{{tag}}", tag).replace("{{tag}}", tag), displayLength: 3000 })
brInsert('#' + tag + " ")
}
favTag();
}
tag = escapeHTML(tag)
var nowPT = localStorage.getItem('stable')
if (nowPT == tag) {
localStorage.removeItem('stable')
M.toast({ html: lang.lang_tags_unrealtime, displayLength: 3000 })
} else {
localStorage.setItem('stable', tag)
M.toast({
html: lang.lang_tags_tagwarn.replace('{{tag}}', tag).replace('{{tag}}', tag),
displayLength: 3000
})
brInsert('#' + tag + ' ')
}
favTag()
}
//タグをフィーチャー
function tagFeature(name, acct_id) {
var domain = localStorage.getItem('domain_' + acct_id)
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/v1/featured_tags'
fetch(start, {
method: 'POST',
headers: {
'content-type': 'application/json',
Authorization: 'Bearer ' + at
},
body: JSON.stringify({
name: name
})
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
return false
})
.then(function(json) {
console.log(json)
M.toast({ html: 'Complete: ' + escapeHTML(name), displayLength: 3000 })
})
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,259 +1,249 @@
/*イメージビューワー*/
//postのimg.jsとは異なります。
function imgv(id, key, acct_id) {
$("#imgprog").text(0);
$('#imgmodal').hide();
$('#imgmodal').attr('src', '../../img/loading.svg');
var murl = $("#" + id + "-image-" + key).attr("data-url");
var type = $("#" + id + "-image-" + key).attr("data-type");
$("#imagemodal").attr("data-id", id);
$("#imagemodal").attr("data-acct", acct_id);
$(document).ready(function () {
if (type == "image") {
$('#imagemodal').modal('open');
xhr = new XMLHttpRequest;
xhr.open('GET', murl, true);
xhr.addEventListener('progress', function (event) {
if (event.lengthComputable) {
var total = event.total;
var now = event.loaded;
var per = now / total * 100;
$("#imgprog").text(Math.floor(per));
}
}, false);
xhr.addEventListener('loadend', function (event) {
var total = event.total;
var now = event.loaded;
var per = now / total * 100;
$("#imgprog").text(Math.floor(per));
}, false);
xhr.send();
$('#imgmodal').attr('src', murl);
$('#imagewrap').dragScroll(); // ドラッグスクロール設定
$('#imgmodal').show();
$('#imagemodal').attr('data-key', key);
$('#imagemodal').attr('data-id', id);
} else if (type == "video" || type == "gifv") {
$('#video').attr('src', murl);
$('#videomodal').modal('open');
$('#imgmodal').show();
$('#imgprog').text(0)
$('#imgsec').text(0)
$('#imgmodal').hide()
$('#imgmodal').attr('src', '../../img/loading.svg')
var murl = $('#' + id + '-image-' + key).attr('data-url')
var ourl = $('#' + id + '-image-' + key).attr('data-original')
if (!ourl || ourl == 'null') {
ourl = murl
}
var type = $('#' + id + '-image-' + key).attr('data-type')
$('#imagemodal').attr('data-id', id)
$('#imagemodal').attr('data-acct', acct_id)
$('#imagemodal').attr('data-original', ourl)
$('#imagemodal').attr('data-image', murl)
//表示はリモートを使うか(どちらにしろコピーはオリジナル)
var remote_img = localStorage.getItem('remote_img')
if (remote_img == 'yes') {
murl = ourl
}
$(document).ready(function() {
if (type == 'image') {
$('#imagemodal').modal('open')
imageXhr(id, key, murl)
$('#imagewrap').dragScroll() // ドラッグスクロール設定
$('#imgmodal').show()
$('#imagemodal').attr('data-key', key)
$('#imagemodal').attr('data-id', id)
} else if (type == 'video' || type == 'gifv') {
$('#video').attr('src', murl)
$('#videomodal').modal('open')
$('#imgmodal').show()
}
var element = new Image();
var width;
element.onload = function () {
var width = element.naturalWidth;
var height = element.naturalHeight;
var windowH = $(window).height();
var windowW = $(window).width();
$("#imagemodal").css("bottom", "0")
$("#imagemodal img").css("width", "auto")
if (height < windowH) {
$("#imagemodal").css("height", height + 60 + "px")
$("#imagemodal img").css("height", "100%")
if (width > windowW * 0.8) {
$("#imagemodal").css("width", "80vw")
$("#imagemodal img").css("width", "100%")
var heightS = windowW * 0.8 / width * height;
$("#imagemodal").css("height", heightS + 60 + "px")
} else {
$("#imagemodal").css("width", width + "px")
}
} else {
$("#imagemodal img").css("width", "auto")
var widthS = windowH / height * width;
if (widthS < windowW) {
$("#imagemodal").css("width", widthS + "px")
} else {
$("#imagemodal").css("width", "100vw")
}
$("#imagemodal").css("height", "100vh")
$("#imagemodal img").css("height", "calc(100vh - 60px)")
}
}
if ($("#" + id + "-image-" + (key * 1 + 1)).length == 0) {
$("#image-next").prop("disabled", true);
} else {
$("#image-next").prop("disabled", false);
}
if ($("#" + id + "-image-" + (key * 1 - 1)).length == 0) {
$("#image-prev").prop("disabled", true);
} else {
$("#image-prev").prop("disabled", false);
}
element.src = murl;
});
})
}
//イメージビューワーの送り
function imgCont(type) {
$("#imgprog").text(0);
var key = $('#imagemodal').attr('data-key');
var id = $('#imagemodal').attr('data-id');
if (type == "next") {
key++;
} else if (type == "prev") {
key = key * 1 - 1;
var key = $('#imagemodal').attr('data-key')
var id = $('#imagemodal').attr('data-id')
if (type == 'next') {
key++
} else if (type == 'prev') {
key = key * 1 - 1
}
var murl = $('#' + id + '-image-' + key).attr('data-url')
var ourl = $('#' + id + '-image-' + key).attr('data-original')
var type = $('#' + id + '-image-' + key).attr('data-type')
$('#imagemodal').attr('data-id', id)
$('#imagemodal').attr('data-acct', acct_id)
$('#imagemodal').attr('data-original', ourl)
$('#imagemodal').attr('data-image', murl)
//表示はリモートを使うか(どちらにしろコピーはオリジナル)
var remote_img = localStorage.getItem('remote_img')
if (remote_img == 'yes' && ourl != 'null') {
murl = ourl
}
var murl = $("#" + id + "-image-" + key).attr("data-url");
if (murl) {
$('#imgmodal').attr('src', '../../img/loading.svg');
var type = $("#" + id + "-image-" + key).attr("data-type");
$(document).ready(function () {
if (type == "image") {
xhr = new XMLHttpRequest;
xhr.open('GET', murl, true);
xhr.responseType = "arraybuffer";
xhr.addEventListener('progress', function (event) {
if (event.lengthComputable) {
var total = event.total;
var now = event.loaded;
var per = now / total * 100;
$("#imgprog").text(Math.floor(per));
}
}, false);
xhr.addEventListener('loadend', function (event) {
var total = event.total;
var now = event.loaded;
var per = now / total * 100;
$("#imgprog").text(Math.floor(per));
}, false);
xhr.send();
$('#imgmodal').attr('src', murl);
$('#imagewrap').dragScroll(); // ドラッグスクロール設定
$('#imagemodal').attr('data-key', key);
$('#imagemodal').attr('data-id', id);
} else if (type == "video" || type == "gifv") {
$('#video').attr('src', murl);
$('#videomodal').modal('open');
$('#imgprog').text(0)
$('#imgsec').text(0)
$('#imgmodal').attr('src', '../../img/loading.svg')
var type = $('#' + id + '-image-' + key).attr('data-type')
$(document).ready(function() {
if (type == 'image') {
imageXhr(id, key, murl)
$('#imagewrap').dragScroll() // ドラッグスクロール設定
$('#imagemodal').attr('data-key', key)
$('#imagemodal').attr('data-id', id)
} else if (type == 'video' || type == 'gifv') {
$('#video').attr('src', murl)
$('#videomodal').modal('open')
}
var element = new Image();
var width;
element.onload = function () {
var width = element.naturalWidth;
var height = element.naturalHeight;
var windowH = $(window).height();
var windowW = $(window).width();
$("#imagemodal").css("bottom", "0")
$("#imagemodal img").css("width", "auto")
if (height < windowH) {
$("#imagemodal").css("height", height + 60 + "px")
$("#imagemodal img").css("height", "100%")
if (width > windowW * 0.8) {
$("#imagemodal").css("width", "80vw")
$("#imagemodal img").css("width", "100%")
var heightS = windowW * 0.8 / width * height;
$("#imagemodal").css("height", heightS + 60 + "px")
} else {
$("#imagemodal").css("width", width + "px")
}
} else {
$("#imagemodal img").css("width", "auto")
var widthS = windowH / height * width;
if (widthS < windowW) {
$("#imagemodal").css("width", widthS + "px")
} else {
$("#imagemodal").css("width", "100vw")
}
$("#imagemodal").css("height", "100vh")
$("#imagemodal img").css("height", "calc(100vh - 60px)")
}
}
if ($("#" + id + "-image-" + (key * 1 + 1)).length === 0) {
$("#image-next").prop("disabled", true);
} else {
$("#image-next").prop("disabled", false);
}
if ($("#" + id + "-image-" + (key * 1 - 1)).length === 0) {
$("#image-prev").prop("disabled", true);
} else {
$("#image-prev").prop("disabled", false);
}
element.src = murl;
});
})
}
}
function imageXhr(id, key, murl) {
var startTime = new Date()
xhr = new XMLHttpRequest()
xhr.open('GET', murl, true)
xhr.responseType = 'arraybuffer'
xhr.addEventListener(
'progress',
function(event) {
if (event.lengthComputable) {
var total = event.total
var now = event.loaded
var per = (now / total) * 100
$('#imgprog').text(Math.floor(per))
}
},
false
)
xhr.addEventListener(
'loadend',
function(event) {
var total = event.total
$('#imgbyte').text(Math.floor(total / 1024))
var now = event.loaded
var per = (now / total) * 100
$('#imgprog').text(Math.floor(per))
},
false
)
xhr.onreadystatechange = function() {
if (this.readyState == 4 && this.status == 200) {
r = new FileReader()
r.readAsDataURL(this.response)
r.onload = function() {
var b64 = r.result
var element = new Image()
var width
element.onload = function() {
var width = element.naturalWidth
var height = element.naturalHeight
var windowH = $(window).height()
var windowW = $(window).width()
$('#imagemodal').css('bottom', '0')
$('#imagemodal img').css('width', 'auto')
if (height < windowH) {
$('#imagemodal').css('height', height + 60 + 'px')
$('#imagemodal img').css('height', '100%')
if (width > windowW * 0.8) {
$('#imagemodal').css('width', '80vw')
$('#imagemodal img').css('width', '100%')
var heightS = ((windowW * 0.8) / width) * height
$('#imagemodal').css('height', heightS + 60 + 'px')
} else {
$('#imagemodal').css('width', width + 'px')
}
} else {
$('#imagemodal img').css('width', 'auto')
var widthS = (windowH / height) * width
if (widthS < windowW) {
$('#imagemodal').css('width', widthS + 'px')
} else {
$('#imagemodal').css('width', '100vw')
}
$('#imagemodal').css('height', '100vh')
$('#imagemodal img').css('height', 'calc(100vh - 60px)')
}
}
if ($('#' + id + '-image-' + (key * 1 + 1)).length == 0) {
$('#image-next').prop('disabled', true)
} else {
$('#image-next').prop('disabled', false)
}
if ($('#' + id + '-image-' + (key * 1 - 1)).length == 0) {
$('#image-prev').prop('disabled', true)
} else {
$('#image-prev').prop('disabled', false)
}
element.src = b64
var endTime = new Date()
var proctime = endTime.getTime() - startTime.getTime()
$('#imgsec').text(proctime)
$('#imgmodal').attr('src', b64)
}
}
}
xhr.responseType = 'blob'
xhr.send()
}
//ズームボタン(z:倍率)
function zoom(z) {
var wdth = $('#imagewrap img').width();
var wdth = wdth * z;
$('#imagewrap img').css("width", wdth + "px");
var hgt = $('#imagewrap img').height();
var hgt = hgt * z;
$('#imagewrap img').css("height", hgt + "px");
var wdth = $('#imagewrap img').width()
var wdth = wdth * z
$('#imagewrap img').css('width', wdth + 'px')
var hgt = $('#imagewrap img').height()
var hgt = hgt * z
$('#imagewrap img').css('height', hgt + 'px')
}
//スマホ対応ドラッグ移動システム
(function () {
$.fn.dragScroll = function () {
var target = this;
$(this).mousedown(function (event) {
$(this)
.data('down', true)
.data('x', event.clientX)
.data('y', event.clientY)
.data('scrollLeft', this.scrollLeft)
.data('scrollTop', this.scrollTop);
return false;
}).css({
'overflow': 'hidden', // スクロールバー非表示
'cursor': 'move'
});
;(function() {
$.fn.dragScroll = function() {
var target = this
$(this)
.mousedown(function(event) {
$(this)
.data('down', true)
.data('x', event.clientX)
.data('y', event.clientY)
.data('scrollLeft', this.scrollLeft)
.data('scrollTop', this.scrollTop)
return false
})
.css({
overflow: 'hidden', // スクロールバー非表示
cursor: 'move'
})
// ウィンドウから外れてもイベント実行
$(document).mousemove(function (event) {
if ($(target).data('down') == true) {
// スクロール
target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') -
event.clientX);
target.scrollTop($(target).data('scrollTop') + $(target).data('y') -
event.clientY);
return false; // 文字列選択を抑止
}
}).mouseup(function (event) {
$(target).data('down', false);
});
$(this).on('touchstart', function (event) {
$(this)
.data('down', true)
.data('x', getX(event))
.data('y', getY(event))
.data('scrollLeft', this.scrollLeft)
.data('scrollTop', this.scrollTop);
return false;
}).css({
'overflow': 'hidden', // スクロールバー非表示
'cursor': 'move'
}); //指が触れたか検知
$(this).on('touchmove', function (event) {
$(document)
.mousemove(function(event) {
if ($(target).data('down') == true) {
// スクロール
target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') - event.clientX)
target.scrollTop($(target).data('scrollTop') + $(target).data('y') - event.clientY)
return false // 文字列選択を抑止
}
})
.mouseup(function(event) {
$(target).data('down', false)
})
$(this)
.on('touchstart', function(event) {
$(this)
.data('down', true)
.data('x', getX(event))
.data('y', getY(event))
.data('scrollLeft', this.scrollLeft)
.data('scrollTop', this.scrollTop)
return false
})
.css({
overflow: 'hidden', // スクロールバー非表示
cursor: 'move'
}) //指が触れたか検知
$(this).on('touchmove', function(event) {
if ($(target).data('down') === true) {
// スクロール
target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') -
getX(event));
target.scrollTop($(target).data('scrollTop') + $(target).data('y') -
getY(event));
return false; // 文字列選択を抑止
} else { }
}); //指が動いたか検知
$(this).on('touchend', function (event) {
$(target).data('down', false);
});
target.scrollLeft($(target).data('scrollLeft') + $(target).data('x') - getX(event))
target.scrollTop($(target).data('scrollTop') + $(target).data('y') - getY(event))
return false // 文字列選択を抑止
} else {
}
}) //指が動いたか検知
$(this).on('touchend', function(event) {
$(target).data('down', false)
})
return this;
return this
}
})(jQuery);
})(jQuery)
function getX(event) {
return event.originalEvent.touches[0].pageX;
return event.originalEvent.touches[0].pageX
}
function getY(event) {
return event.originalEvent.touches[0].pageY;
return event.originalEvent.touches[0].pageY
}
//マウスホイールで拡大
var element = document.getElementById("imagemodal");
element.onmousewheel = function (e) {
var delta = e.wheelDelta;
var element = document.getElementById('imagemodal')
element.onmousewheel = function(e) {
var delta = e.wheelDelta
if (delta > 0) {
zoom(1.1)
} else {
@@ -263,22 +253,33 @@ element.onmousewheel = function (e) {
//当該トゥート
function detFromImg() {
var id = $("#imagemodal").attr("data-id");
var acct_id = $("#imagemodal").attr("data-acct");
$('#imagemodal').modal('close');
details(id, acct_id);
var id = $('#imagemodal').attr('data-id')
var acct_id = $('#imagemodal').attr('data-acct')
$('#imagemodal').modal('close')
details(id, acct_id)
}
//画像保存
function dlImg() {
var url = $("#imgmodal").attr("src");
if (localStorage.getItem("savefolder")) {
var save = localStorage.getItem("savefolder");
} else {
var save = "";
var ourl = $('#imagemodal').attr('data-original')
var murl = $('#imagemodal').attr('data-image')
var remote_img = localStorage.getItem('remote_img')
if (remote_img == 'yes') {
murl = ourl
}
postMessage(["generalDL", [url, save, false]], "*")
var save = localStorage.getItem('savefolder')
if (!save || save == 'null') {
var save = ''
}
postMessage(['generalDL', [murl, save, false]], '*')
}
function openFinder(dir) {
postMessage(["openFinder", dir], "*")
}
postMessage(['openFinder', dir], '*')
}
function stopVideo() {
document.getElementById('video').pause()
}
function copyImgUrl() {
var murl = $('#imagemodal').attr('data-original')
execCopy(murl)
M.toast({ html: lang.lang_img_copyDone, displayLength: 1500 })
}

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

View File

@@ -17,6 +17,16 @@ function menu() {
}
$('#menu').css("left", left + "px")
$('#menu').css("top", top + "px")
var height = localStorage.getItem("menu-height");
var width = localStorage.getItem("menu-width");
if(height){
$('#menu').css("height", height + "px")
}else{
$('#menu').css("height", "460px")
}
if(width){
$('#menu').css("width", width + "px")
}
$('#menu').fadeIn();
$("#menu-bar").html("TheDesk " + localStorage.getItem("ver"));
$(".menu-content").addClass("hide");
@@ -49,7 +59,19 @@ $(function () {
localStorage.setItem("menu-top", top);
}
});
$("#menu").resizable({
minHeight: 150,
minWidth: 200,
stop: function (event, ui) {
localStorage.setItem("menu-height", ui.size.height);
localStorage.setItem("menu-width", ui.size.width);
}
});
});
function help() {
postMessage(["openUrl", "https://docs.thedesk.top"], "*")
$("#left-menu div").removeClass("active");
$("#helpMenu").addClass("active");
$(".menu-content").addClass("hide");
$("#help-box").removeClass("hide");
postMessage(["sendSinmpleIpc", "getLogs"], "*")
}

View File

@@ -1,104 +1,140 @@
/*ささやきボックス(Cr民並感)*/
//✕隠す
function hide() {
$("#right-side").hide()
$('#right-side').hide()
$('#right-side').css('width', '300px')
$('#left-side').css('width', '100%')
var width = localStorage.getItem('postbox-width')
if (width) {
width = width.replace('px', '') * 1
} else {
width = 300
}
$('#post-box').css('width', width)
$('#post-box').fadeOut()
$("#post-box").removeClass("appear")
$("#emoji").addClass("hide")
$("#left-side").show();
$("#default-emoji").show();
$("#unreact").show();
$("#addreact").addClass("hide");
$('#post-box').removeClass('appear')
$('#emoji').addClass('hide')
$('#left-side').show()
$('#default-emoji').show()
$('#unreact').show()
$('#addreact').addClass('hide')
}
//最小化
function mini() {
$("body").toggleClass("mini-post");
if ($("body").hasClass("mini-post")) {
$(".mini-btn").text("expand_less");
$('body').toggleClass('mini-post')
if ($('body').hasClass('mini-post')) {
$('.mini-btn').text('expand_less')
} else {
$(".mini-btn").text("expand_more");
$('.mini-btn').text('expand_more')
}
}
//最小化時に展開
function show() {
$("#post-box").addClass("appear")
$("#textarea").focus();
console.log("show" + localStorage.getItem("postbox-left"));
var left = localStorage.getItem("postbox-left");
$('#post-box').addClass('appear')
$('#textarea').focus()
console.log('show' + localStorage.getItem('postbox-left'))
var left = localStorage.getItem('postbox-left')
if (left > $('body').width() - $('#post-box').width()) {
left = $('body').width() - $('#post-box').width();
left = $('body').width() - $('#post-box').width()
} else if (left < 0) {
left = 0;
left = 0
}
var top = localStorage.getItem("postbox-top");
var top = localStorage.getItem('postbox-top')
if (top > $('body').height() - $('#post-box').height()) {
top = $('body').height() - $('#post-box').height();
top = $('body').height() - $('#post-box').height()
} else if (top < 0) {
top = 0;
top = 0
}
$('#post-box').css("left", left + "px")
$('#post-box').css("top", top + "px")
$('#post-box').fadeIn();
$('#textarea').characterCounter();
$('#post-box').css('left', left + 'px')
$('#post-box').css('top', top + 'px')
var width = localStorage.getItem('postbox-width')
if (width) {
$('#post-box').css('width', width + 'px')
} else {
$('#post-box').css('width', '300px')
}
$('#post-box').fadeIn()
$('#textarea').characterCounter()
mdCheck()
}
$(function () {
$("#post-box").draggable({
handle: "#post-bar",
stop: function () {
var left = $('#post-box').offset().left;
$(function() {
$('#post-box').draggable({
handle: '#post-bar',
stop: function() {
var left = $('#post-box').offset().left
if (left > $('body').width() - $('#post-box').width()) {
left = $('body').width() - $('#post-box').width();
left = $('body').width() - $('#post-box').width()
} else if (left < 0) {
left = 0;
left = 0
}
var top = $('#post-box').offset().top;
var top = $('#post-box').offset().top
if (top > $('body').height() - $('#post-box').height()) {
top = $('body').height() - $('#post-box').height();
top = $('body').height() - $('#post-box').height()
} else if (top < 0) {
top = 0;
top = 0
}
localStorage.setItem("postbox-left", left);
localStorage.setItem("postbox-top", top);
localStorage.setItem('postbox-left', left)
localStorage.setItem('postbox-top', top)
}
});
});
})
$('#post-box').resizable({
minHeight: 150,
minWidth: 100,
stop: function(event, ui) {
$('#textarea').blur()
localStorage.setItem('postbox-width', ui.size.width)
}
})
})
//コード受信
if (location.search) {
var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
var mode = m[1];
var codex = m[2];
if (mode == "share") {
console.log(codex);
$('textarea').focus();
$("#textarea").val(decodeURI(codex));
show();
$("body").removeClass("mini-post");
$(".mini-btn").text("expand_less");
var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
var mode = m[1]
var codex = m[2]
if (mode == 'share') {
$('textarea').focus()
$('#textarea').val(decodeURI(codex))
show()
$('body').removeClass('mini-post')
$('.mini-btn').text('expand_less')
}
}
$('#posttgl').click(function (e) {
if (!$('#post-box').hasClass("appear")) {
show();
$('#posttgl').click(function(e) {
if (!$('#post-box').hasClass('appear')) {
show()
} else {
hide();
hide()
}
});
$('.cvo').removeClass('selectedToot')
selectedColumn = 0
selectedToot = 0
})
$("#timeline-container,#group").click(function (e) {
if (localStorage.getItem("box") != "absolute") {
if ($('#post-box').hasClass("appear") && !localStorage.getItem("nohide")) {
hide();
$('#timeline-container,#group').click(function(e) {
if (localStorage.getItem('box') != 'absolute') {
if ($('#post-box').hasClass('appear') && !localStorage.getItem('nohide')) {
hide()
}
}
localStorage.removeItem("nohide")
});
$('#textarea,#cw-text').focusout(function (e) {
localStorage.setItem("nohide", true)
var countup = function () {
localStorage.removeItem("nohide")
$('.cvo').removeClass('selectedToot')
selectedColumn = 0
selectedToot = 0
localStorage.removeItem('nohide')
})
$('#contextWrap').click(function(e) {
$('#contextWrap').addClass('hide')
$('.contextMenu').addClass('hide')
$('.act-icon').text('expand_more')
})
$('#textarea,#cw-text').focusout(function(e) {
localStorage.setItem('nohide', true)
var countup = function() {
localStorage.removeItem('nohide')
}
//setTimeout(remove, 100);
});
$('.cvo').removeClass('selectedToot')
selectedColumn = 0
selectedToot = 0
})

View File

@@ -1,49 +1,70 @@
//スクロールで続きを読む
function scrollevent() {
$(".tl-box").scroll(function () {
scrollck();
});
$('.tl-box').scroll(function() {
scrollck()
})
}
scrollevent();
scrollevent()
function scrollck() {
$(".tl-box").each(function (i, elem) {
var tlid = $(this).attr('tlid');
//一番上ならためていた新しいトゥートを表示
$('.tl-box').each(function(i, elem) {
var tlid = $(this).attr('tlid')
var len = $('#timeline_' + tlid + ' .cvo').length
//一番上ならためていた新しいトゥートを表示ないしtealなら未読管理モード
if ($(this).scrollTop() === 0) {
var pool = localStorage.getItem("pool_" + tlid);
if (pool) {
$("#timeline_" + tlid).prepend(pool);
jQuery("time.timeago").timeago();
localStorage.removeItem("pool_" + tlid);
if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
var pool = localStorage.getItem('pool_' + tlid)
if (pool) {
$('#timeline_' + tlid).prepend(pool)
jQuery('time.timeago').timeago()
localStorage.removeItem('pool_' + tlid)
}
} else {
ueload(tlid)
}
//自動リフレッシュ
if ($("#timeline_" + tlid + " .cvo").length > 30) {
for (var i = 30; i < $("#timeline_" + tlid + " .cvo").length; i++) {
$("#timeline_" + tlid + " .cvo").eq(i).remove();
if (len > 30) {
for (var i = 30; i < $('#timeline_' + tlid + ' .cvo').length; i++) {
$('#timeline_' + tlid + ' .cvo')
.eq(i)
.remove()
}
}
}
//続きを読むトリガー
var scrt = $(this).find(".tl").height() - $(window).height();
var scr = $(this).scrollTop();
if (scr > scrt) {
console.log("kicked more loading:" + tlid);
moreload('', tlid);
var scrt =
$(this)
.find('.tl')
.height() - $(window).height()
var scr = $(this).scrollTop()
if (scr > scrt && scrt > 0) {
console.log('kicked more loading:' + tlid)
moreload('', tlid)
}
});
})
}
function goTop(id) {
if ($("#timeline_box_" + id + "_box .tl-box").scrollTop() > 500) {
$("#timeline_box_" + id + "_box .tl-box").scrollTop(500)
if ($('#unread_' + id + ' .material-icons').hasClass('teal-text')) {
$('#unread_' + id + ' .material-icons').removeClass('teal-text')
var multi = localStorage.getItem('column')
var obj = JSON.parse(multi)
var acct_id = obj[id * 1].domain
var type = obj[id * 1].type
console.log(id, type)
columnReload(id, type)
}
$("#timeline_box_" + id + "_box .tl-box").animate({ scrollTop: 0 });
if ($('#timeline_box_' + id + '_box .tl-box').scrollTop() > 500) {
$('#timeline_box_' + id + '_box .tl-box').scrollTop(500)
}
$('#timeline_box_' + id + '_box .tl-box').animate({ scrollTop: 0 })
}
function goColumn(key) {
$("#sort-box").addClass("hide");
$("#sort-box").removeClass("show");
$('#sort-box').addClass('hide')
$('#sort-box').removeClass('show')
if ($('[tlid=' + key + ']').length) {
$("#timeline-container").animate({ scrollLeft: $("#timeline-container").scrollLeft() + $('[tlid=' + key + ']').offset().left });
$('#timeline-container').animate({
scrollLeft: $('#timeline-container').scrollLeft() + $('[tlid=' + key + ']').offset().left
})
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,6 @@
//ソートデータ読み込み
function sortload() {
function sortLoad () {
$("#sort").html("");
var col = localStorage.getItem("column");
if (col) {
var obj = JSON.parse(col);
@@ -104,7 +105,7 @@ function sort() {
localStorage.setItem("column", json);
$("#sort").html("");
M.toast({ html: "Sorted", displayLength: 3000 })
sortload();
sortLoad();
parseColumn();
sortMenu()
}
@@ -115,5 +116,5 @@ function sortMenu() {
$(".menu-content").addClass("hide");
$("#sort-box").removeClass("hide");
$("#sort").html("");
sortload();
sortLoad();
}

View File

@@ -1,205 +1,185 @@
function spotifyConnect() {
var auth = "https://accounts.spotify.com/authorize?client_id=0f18e54abe0b4aedb4591e353d3aff69&redirect_uri=https://thedesk.top/spotify-connect&response_type=code&scope=user-read-currently-playing";
var platform = localStorage.getItem("platform");
if (platform == "win32") {
postMessage(["openUrl", auth], "*")
postMessage(["sendSinmpleIpc", "quit"], "*")
} else {
auth = auth + "&state=code";
$("#spotify-code-show").removeClass("hide");
postMessage(["openUrl", auth], "*")
}
var auth = "https://accounts.spotify.com/authorize?client_id=0f18e54abe0b4aedb4591e353d3aff69&redirect_uri=https://thedesk.top/spotify-connect&response_type=code&scope=user-read-currently-playing";
var platform = localStorage.getItem("platform");
if (platform == "win32") {
postMessage(["openUrl", auth], "*");
postMessage(["sendSinmpleIpc", "quit"], "*");
} else {
auth = auth + "&state=code";
$("#spotify-code-show").removeClass("hide");
postMessage(["openUrl", auth], "*");
}
}
function spotifyAuth() {
var code = $("#spotify-code").val();
localStorage.setItem("spotify", "code");
localStorage.setItem("spotify-refresh", code);
$("#spotify-code-show").addClass("hide");
$("#spotify-enable").addClass("disabled");
$("#spotify-disable").removeClass("disabled");
var code = $("#spotify-code").val();
localStorage.setItem("spotify", "code");
localStorage.setItem("spotify-refresh", code);
$("#spotify-code-show").addClass("hide");
$("#spotify-enable").addClass("disabled");
$("#spotify-disable").removeClass("disabled");
}
function spotifyDisconnect() {
localStorage.removeItem("spotify");
localStorage.removeItem("spotify-refresh");
checkSpotify();
localStorage.removeItem("spotify");
localStorage.removeItem("spotify-refresh");
checkSpotify();
}
function checkSpotify() {
if (localStorage.getItem("spotify")) {
$("#spotify-enable").addClass("disabled");
$("#spotify-disable").removeClass("disabled");
} else {
$("#spotify-enable").removeClass("disabled");
$("#spotify-disable").addClass("disabled");
}
var content = localStorage.getItem("np-temp");
if (!content || content == "" || content == "null") {
var content = "#NowPlaying {song} / {album} / {artist}\n{url} #SpotifyWithTheDesk";
}
$("#np-temp").val(content);
var flag = localStorage.getItem("artwork");
if (flag) {
$("#awk_yes").prop("checked", true);
} else {
$("#awk_no").prop("checked", true);
}
if (localStorage.getItem("spotify")) {
$("#spotify-enable").addClass("disabled");
$("#spotify-disable").removeClass("disabled");
} else {
$("#spotify-enable").removeClass("disabled");
$("#spotify-disable").addClass("disabled");
}
var content = localStorage.getItem("np-temp");
if (!content || content == "" || content == "null") {
var content = "#NowPlaying {song} / {album} / {artist}\n{url} #SpotifyWithTheDesk";
}
$("#np-temp").val(content);
var flag = localStorage.getItem("artwork");
if (flag) {
$("#awk_yes").prop("checked", true);
} else {
$("#awk_no").prop("checked", true);
}
}
function spotifyFlagSave() {
var awk = $("[name=awk]:checked").val();
if (awk == "yes") {
localStorage.setItem("artwork", "yes");
M.toast({ html: lang.lang_spotify_img, displayLength: 3000 })
} else {
localStorage.removeItem("artwork");
M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
}
var awk = $("[name=awk]:checked").val();
if (awk == "yes") {
localStorage.setItem("artwork", "yes");
M.toast({ html: lang.lang_spotify_img, displayLength: 3000 });
} else {
localStorage.removeItem("artwork");
M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 });
}
}
function nowplaying(mode) {
if (mode == "spotify") {
var start = "https://thedesk.top/now-playing?at=" + localStorage.getItem("spotify") + "&rt=" + localStorage.getItem("spotify-refresh");
var at = localStorage.getItem("spotify");
if (at) {
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json'
}
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
console.table(json);
if (json.length < 1) {
return false;
}
var item = json.item;
var img = item.album.images[0].url;
var flag = localStorage.getItem("artwork");
if (flag) {
postMessage(["bmpImage", [img, 0]], "*")
}
var content = localStorage.getItem("np-temp");
if (!content || content == "" || content == "null") {
var content = "#NowPlaying {song} / {album} / {artist}\n{url}";
}
var regExp = new RegExp("{song}", "g");
content = content.replace(regExp, item.name);
var regExp = new RegExp("{album}", "g");
content = content.replace(regExp, item.album.name);
var regExp = new RegExp("{artist}", "g");
content = content.replace(regExp, item.artists[0].name);
var regExp = new RegExp("{url}", "g");
content = content.replace(regExp, item.external_urls.spotify);
var regExp = new RegExp("{composer}", "g");
content = content.replace(regExp, "");
var regExp = new RegExp("{hz}", "g");
content = content.replace(regExp, "");
var regExp = new RegExp("{bitRate}", "g");
content = content.replace(regExp, "");
var regExp = new RegExp("{lyricist}", "g");
content = content.replace(regExp, "");
var regExp = new RegExp("{bpm}", "g");
content = content.replace(regExp, "");
var regExp = new RegExp("{genre}", "g");
content = content.replace(regExp, "");
$("#textarea").val(content);
});
} else {
Swal.fire({
type: 'info',
title: lang.lang_spotify_acct
})
}
} else if (mode == "itunes") {
postMessage(["itunes", ""], "*")
}
if (mode == "spotify") {
var start = "https://thedesk.top/now-playing?at=" + localStorage.getItem("spotify") + "&rt=" + localStorage.getItem("spotify-refresh");
var at = localStorage.getItem("spotify");
if (at) {
fetch(start, {
method: "GET",
headers: {
"content-type": "application/json"
}
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text);
});
}
return response.json();
})
.catch(function(error) {
todo(error);
setLog(start, "JSON", error);
console.error(error);
})
.then(function(json) {
console.table(json);
if (json.length < 1) {
return false;
}
var item = json.item;
var img = item.album.images[0].url;
var flag = localStorage.getItem("artwork");
if (flag) {
postMessage(["bmpImage", [img, 0]], "*");
}
var content = localStorage.getItem("np-temp");
if (!content || content == "" || content == "null") {
var content = "#NowPlaying {song} / {album} / {artist}\n{url}";
}
var regExp = new RegExp("{song}", "g");
content = content.replace(regExp, item.name);
var regExp = new RegExp("{album}", "g");
content = content.replace(regExp, item.album.name);
var regExp = new RegExp("{artist}", "g");
content = content.replace(regExp, item.artists[0].name);
var regExp = new RegExp("{url}", "g");
content = content.replace(regExp, item.external_urls.spotify);
var regExp = new RegExp("{composer}", "g");
content = content.replace(regExp, "");
var regExp = new RegExp("{hz}", "g");
content = content.replace(regExp, "");
var regExp = new RegExp("{bitRate}", "g");
content = content.replace(regExp, "");
var regExp = new RegExp("{lyricist}", "g");
content = content.replace(regExp, "");
var regExp = new RegExp("{bpm}", "g");
content = content.replace(regExp, "");
var regExp = new RegExp("{genre}", "g");
content = content.replace(regExp, "");
$("#textarea").val(content);
});
} else {
Swal.fire({
type: "info",
title: lang.lang_spotify_acct
});
}
} else if (mode == "itunes") {
postMessage(["itunes", ""], "*");
}
}
function npCore(arg) {
if (arg.cmd) {
console.error(arg);
return;
}
console.table(arg);
var content = localStorage.getItem("np-temp");
if (!content || content == "" || content == "null") {
var content = "#NowPlaying {song} / {album} / {artist}\n{url}";
}
var flag = localStorage.getItem("artwork");
var platform = localStorage.getItem("platform");
if (platform == "win32") {
if (flag && arg.path) {
media(arg.path, "image/png", "new");
}
} else if (platform == "darwin") {
if (flag && arg.existsArtwork) {
media(arg.artworks[0].data, "image/png", "new");
}
}
var regExp = new RegExp("{song}", "g");
content = content.replace(regExp, arg.name);
var regExp = new RegExp("{album}", "g");
content = content.replace(regExp, arg.album);
var regExp = new RegExp("{artist}", "g");
content = content.replace(regExp, arg.artist);
var regExp = new RegExp("{url}", "g");
content = content.replace(regExp, "");
var regExp = new RegExp("{composer}", "g");
content = content.replace(regExp, arg.composer);
var regExp = new RegExp("{hz}", "g");
content = content.replace(regExp, arg.sampleRate / 1000 + "kHz");
var regExp = new RegExp("{lyricist}", "g");
content = content.replace(regExp, "");
var regExp = new RegExp("{bpm}", "g");
content = content.replace(regExp, "");
var regExp = new RegExp("{bitRate}", "g");
content = content.replace(regExp, arg.bitRate + "kbps");
var regExp = new RegExp("{genre}", "g");
content = content.replace(regExp, arg.genre);
$("#textarea").val(content);
console.table(arg);
var content = localStorage.getItem("np-temp");
if (!content || content == "" || content == "null") {
var content = "#NowPlaying {song} / {album} / {artist}\n{url}";
}
var flag = localStorage.getItem("artwork");
var platform = localStorage.getItem("platform");
if (platform == "win32") {
if (flag && arg.path) {
media(arg.path, "image/png", "new");
}
} else if (platform == "darwin") {
if (flag && arg.artwork) {
media(arg.artwork, "image/png", "new");
}
}
var regExp = new RegExp("{song}", "g");
content = content.replace(regExp, arg.name);
var regExp = new RegExp("{album}", "g");
if (arg.album) {
if (arg.album.name) {
content = content.replace(regExp, arg.album.name);
}
}
var regExp = new RegExp("{artist}", "g");
content = content.replace(regExp, arg.artist);
var regExp = new RegExp("{url}", "g");
content = content.replace(regExp, "");
var regExp = new RegExp("{composer}", "g");
content = content.replace(regExp, arg.composer);
var regExp = new RegExp("{hz}", "g");
content = content.replace(regExp, arg.sampleRate / 1000 + "kHz");
var regExp = new RegExp("{lyricist}", "g");
content = content.replace(regExp, "");
var regExp = new RegExp("{bpm}", "g");
content = content.replace(regExp, "");
var regExp = new RegExp("{bitRate}", "g");
content = content.replace(regExp, arg.bitRate + "kbps");
var regExp = new RegExp("{genre}", "g");
content = content.replace(regExp, arg.genre);
$("#textarea").val(content);
}
function spotifySave() {
var temp = $("#np-temp").val();
localStorage.setItem("np-temp", temp);
M.toast({ html: lang.lang_spotify_np, displayLength: 3000 })
}
function npprovider() {
var provd = $("[name=npp]:checked").val();
if (!provd) {
if (localStorage.getItem("np_provider")) {
$("[value=" + localStorage.getItem("np_provider") + "]").prop("checked", true);
} else {
$("[value=AIMP]").prop("checked", true);
localStorage.setItem("np_provider", "AIMP");
}
} else {
if (provd != localStorage.getItem("np_provider")) {
M.toast({ html: lang.lang_setting_npprovide.replace("{{set}}", provd), displayLength: 3000 })
}
localStorage.setItem("np_provider", provd);
postMessage(["itunes", ["set", provd]], "*")
}
var temp = $("#np-temp").val();
localStorage.setItem("np-temp", temp);
M.toast({ html: lang.lang_spotify_np, displayLength: 3000 });
}
if (location.search) {
var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
var mode = m[1];
var codex = m[2];
if (mode == "spotify") {
var coder = codex.split(":");
localStorage.setItem("spotify", coder[0]);
localStorage.setItem("spotify-refresh", coder[1]);
} else {
}
var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
var mode = m[1];
var codex = m[2];
if (mode == "spotify") {
var coder = codex.split(":");
localStorage.setItem("spotify", coder[0]);
localStorage.setItem("spotify-refresh", coder[1]);
} else {
}
}
$("#npbtn").click(function () {
nowplaying('spotify');
});
$("#npbtn").bind('contextmenu', function () {
nowplaying('itunes');
return false;
});

View File

@@ -1,28 +1,33 @@
//テーマ適用
function themes(theme) {
if (!theme) {
var theme = localStorage.getItem("theme");
var theme = localStorage.getItem('theme')
if (!theme) {
var theme = "black";
localStorage.setItem("theme", "black");
var theme = 'black'
localStorage.setItem('theme', 'black')
}
}
$("html").removeClass("indigotheme");
$("html").removeClass("greentheme");
$("html").removeClass("browntheme");
$("html").removeClass("blacktheme");
$("html").removeClass("customtheme");
$("html").addClass(theme + "theme");
var font = localStorage.getItem("font");
var el = document.getElementsByTagName('html')[0]
el.classList.remove('indigotheme')
el.classList.remove('greentheme')
el.classList.remove('browntheme')
el.classList.remove('blacktheme')
el.classList.remove('bluetheme')
el.classList.remove('customtheme')
el.classList.add(theme + 'theme')
var font = localStorage.getItem('font')
if (font) {
$("html").css("font-family", font);
font = font.replace(/"(.+)"/, '$1')
el.style.fontFamily = '"' + font + '"'
} else {
$("html").css("font-family", "");
el.style.fontFamily = ''
}
if (theme == "custom") {
if (localStorage.getItem("customtheme-id")) {
postMessage(["themeCSSRequest", localStorage.getItem("customtheme-id")], "*")
if (theme == 'custom') {
if (localStorage.getItem('customtheme-id')) {
postMessage(['themeCSSRequest', localStorage.getItem('customtheme-id')], '*')
}
}
el.style.backgroundColor = 'var(--bg)'
}
themes();
themes()

View File

@@ -1,137 +1,218 @@
//左下のメッセージ
var todcTrigger = null;
var todcTrigger = null
function todo(mes) {
clearInterval(todcTrigger);
$('#message').text(mes);
$('#message').fadeIn();
todcTrigger = setTimeout(todc, 4000);
clearInterval(todcTrigger)
$('#message').text(mes)
$('#message').fadeIn()
todcTrigger = setTimeout(todc, 4000)
}
function todc() {
$('#message').fadeOut();
$('#message').fadeOut()
}
//reverse
function bottomReverse() {
$("#bottom").toggleClass("reverse");
$(".leftside").toggleClass("reverse");
if ($("#bottom").hasClass("reverse")) {
localStorage.removeItem("reverse")
$('#bottom').toggleClass('reverse')
$('.leftside').toggleClass('reverse')
if ($('#bottom').hasClass('reverse')) {
localStorage.removeItem('reverse')
} else {
localStorage.setItem("reverse", "true")
localStorage.setItem('reverse', 'true')
}
}
function tips(mode) {
postMessage(["sendSinmpleIpc", "endmem"], "*")
clearInterval(clockint);
clearInterval(spotStart);
if (mode == "ver") {
postMessage(['sendSinmpleIpc', 'endmem'], '*')
clearInterval(clockint)
clearInterval(spotStart)
if (mode == 'ver') {
tipsToggle()
$("#tips-text").html('<img src="../../img/desk.png" width="20" onclick="todo(\'!TheDesk! It\\\'s a nice client!\')"><span style="font-size:20px">TheDesk</span> ' + localStorage.getItem("ver") + '[<i class="material-icons" style="font-size:1.2rem;top: 3px;position: relative;">supervisor_account</i><span id="persons">1+</span>]')
localStorage.setItem("tips", "ver")
} else if (mode == "clock") {
$('#tips-text').html(
'<img src="../../img/desk.png" width="20" onclick="todo(\'TheDesk is a nice client!: TheDesk ' +
localStorage.getItem('ver') +
' git: ' +
gitHash +
'\')">TheDesk ' +
localStorage.getItem('ver') +
' {' +
gitHash.slice(0, 7) +
'} [<i class="material-icons" style="font-size:1.2rem;top: 3px;position: relative;">supervisor_account</i><span id="persons">1+</span>]'
)
localStorage.setItem('tips', 'ver')
} else if (mode == 'clock') {
tipsToggle()
localStorage.setItem("tips", "clock")
localStorage.setItem('tips', 'clock')
clock()
} else if (mode == "memory") {
} else if (mode == 'memory') {
tipsToggle()
localStorage.setItem("tips", "memory")
startmem();
} else if (mode == "trend") {
localStorage.setItem('tips', 'memory')
startmem()
} else if (mode == 'trend') {
tipsToggle()
localStorage.setItem("tips", "trend")
localStorage.setItem('tips', 'trend')
trendTagonTip()
} else if (mode == "spotify") {
} else if (mode == 'spotify') {
tipsToggle()
localStorage.setItem("tips", "spotify")
var json = nowplaying("spotifytips")
spotifytips(json)
localStorage.setItem('tips', 'spotify')
spotifytips()
} else if (mode == 'itunes') {
tipsToggle()
localStorage.setItem('tips', 'itunes')
itunestips()
}
}
//メモリ
function startmem() {
postMessage(["sendSinmpleIpc", "startmem"], "*")
postMessage(['sendSinmpleIpc', 'startmem'], '*')
}
function renderMem(use, cpu, total){
$("#tips-text").html(escapeHTML(cpu) + "<br>Memory:" + Math.floor(use / 1024 / 1024 / 102.4) / 10 + "/" + Math.floor(total / 1024 / 1024 / 102.4) / 10 + "GB(" + Math.floor(use / total * 100) + "%)")
function renderMem(use, cpu, total) {
$('#tips-text').html(
escapeHTML(cpu) +
'<br>Memory:' +
Math.floor(use / 1024 / 1024 / 102.4) / 10 +
'/' +
Math.floor(total / 1024 / 1024 / 102.4) / 10 +
'GB(' +
Math.floor((use / total) * 100) +
'%)'
)
}
//トレンドタグ
function trendTagonTip() {
$(".trendtag").remove();
var domain = "imastodon.net"
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/v1/trend_tags"
$('.trendtag').remove()
var domain = 'imastodon.net'
var at = localStorage.getItem('acct_' + acct_id + '_at')
var start = 'https://' + domain + '/api/v1/trend_tags'
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
if (json) {
var tags = "";
json = json.score;
Object.keys(json).forEach(function (tag) {
tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + escapeHTML(tag) + '</a><span class="hide" data-tag="' + tag + '"> <a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="#' + tag + 'のタイムライン">TL</a> <a onclick="show();brInsert(\'#' + tag + '\')" class="pointer" title="#' + tag + 'でトゥート">Toot</a></span><br>';
});
$("#tips-text").html('<div class="trendtag">トレンドタグ<i class="material-icons pointer" onclick="trendTagonTip()" style="font-size:12px">refresh</i>:<br>' + tags + '</div>');
trendTagonTipInterval()
} else {
$("#tips-text").html("");
Authorization: 'Bearer ' + at
}
});
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
if (json) {
var tags = ''
json = json.score
Object.keys(json).forEach(function(tag) {
tags =
tags +
`<a onclick="tagShow('${tag}')" class="pointer">
#${escapeHTML(tag)}
</a>
<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}"> 
<a onclick="tagTL('tag','${tag}',false,'add')" class="pointer" title="#${tag}のタイムライン">TL</a> 
<a onclick="show();brInsert('#${tag}')" class="pointer" title="#${tag}でトゥート">Toot</a>
</span><br>`
})
$('#tips-text').html(
'<div class="trendtag">トレンドタグ<i class="material-icons pointer" onclick="trendTagonTip()" style="font-size:12px">refresh</i>:<br>' +
tags +
'</div>'
)
trendTagonTipInterval()
} else {
$('#tips-text').html('')
}
})
}
//Spotify
spotint = null
function spotifytips() {
var start = "https://thedesk.top/now-playing?at=" + localStorage.getItem("spotify") + "&rt=" + localStorage.getItem("spotify-refresh");
var at = localStorage.getItem("spotify");
if (spotint) clearInterval(spotint)
var start =
'https://thedesk.top/now-playing?at=' +
localStorage.getItem('spotify') +
'&rt=' +
localStorage.getItem('spotify-refresh')
var at = localStorage.getItem('spotify')
if (at) {
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json'
}
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
var ms = json.progress_ms;
var last = 1000 - ms % 1000;
var item = json.item;
var img = item.album.images[0].url;
var artisttxt = "";
for (i = 0; i < item.artists.length; i++) {
if (i > 0) {
artisttxt = artisttxt + "," + item.artists[i].name;
} else {
artisttxt = item.artists[0].name;
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text)
})
}
}
artisttxt = escapeHTML(artisttxt);
sleep(last);
var tms = item.duration_ms;
var per = ms / item.duration_ms * 100;
ms = ms / 1000;
tms = tms / 1000;
var s = Math.round(ms) % 60;
if (s < 10) {
s = "0" + s;
}
var m = (Math.round(ms) - Math.round(ms) % 60) / 60;
var ts = Math.round(tms) % 60;
if (ts < 10) {
ts = "0" + ts;
}
var tm = (Math.round(tms) - Math.round(tms) % 60) / 60;
$("#tips-text").html('<div id="spot-box"><i class="material-icons pointer" onclick="spotifytips()" style="font-size:12px">refresh</i><img src="' + img + '" width="20" id="spot-img">' + escapeHTML(item.name) + '<span class="gray sml" id="spot-art">' + artisttxt + '</span><span id="spot-m">' + m + '</span>:<span id="spot-s">' + s + '</span>/' + tm + ":" + ts + '</span></div><div class="progress grey"><div class="determinate spotify-prog grey lighten-2" style="width: ' + per + '%" data-s="' + Math.round(ms) + '" data-total="' + item.duration_ms + '"></div></div>');
spotint = setInterval(spotStart, 1000);
});
return response.json()
})
.catch(function(error) {
todo(error)
setLog(start, 'JSON', error)
console.error(error)
})
.then(function(json) {
var ms = json.progress_ms
var last = 1000 - (ms % 1000)
var item = json.item
var img = item.album.images[0].url
var artisttxt = ''
for (i = 0; i < item.artists.length; i++) {
if (i > 0) {
artisttxt = artisttxt + ',' + item.artists[i].name
} else {
artisttxt = item.artists[0].name
}
}
artisttxt = escapeHTML(artisttxt)
sleep(last)
var tms = item.duration_ms
var per = (ms / item.duration_ms) * 100
ms = ms / 1000
tms = tms / 1000
var s = Math.round(ms) % 60
if (s < 10) {
s = '0' + s
}
var m = (Math.round(ms) - (Math.round(ms) % 60)) / 60
var ts = Math.round(tms) % 60
if (ts < 10) {
ts = '0' + ts
}
var tm = (Math.round(tms) - (Math.round(tms) % 60)) / 60
var html = `
<div id="spot-box">
<div id="spot-refresh">
<i class="material-icons pointer" onclick="spotifytips()" style="font-size:20px">refresh</i>
<i class="material-icons pointer" onclick="nowplaying('spotify');show()" style="font-size:20px">send</i>
</div>
<div id="spot-cover">
<img src="${img}" id="spot-img">
</div>
<div id="spot-name">
${escapeHTML(item.name)}
</div>
<div id="spot-artist">
<span class="gray sml" id="spot-art">${artisttxt}</span>
</div>
<div id="spot-time">
<span id="spot-m">${m}</span>:<span id="spot-s">${s}</span>/${tm}:${ts}</span>
</div>
<div class="progress grey">
<div class="determinate spotify-prog grey lighten-2"
style="width:${per}%" data-s="${Math.round(ms)}" data-total="${item.duration_ms}">
</div>
</div>
</div>`
$('#tips-text').html(html)
spotint = setInterval(spotStart, 1000)
})
} else {
Swal.fire({
type: 'info',
@@ -140,57 +221,73 @@ function spotifytips() {
}
}
function spotStart() {
var total = $(".spotify-prog").attr("data-total");
var s = $(".spotify-prog").attr("data-s");
var news = s * 1 + 1;
var per = news * 100000 / total;
var ns = news % 60;
var nm = (news - ns) / 60;
var total = $('.spotify-prog').attr('data-total')
var s = $('.spotify-prog').attr('data-s')
var news = s * 1 + 1
var per = (news * 100000) / total
var ns = news % 60
var nm = (news - ns) / 60
if (ns < 10) {
ns = "0" + ns;
ns = '0' + ns
}
if (per >= 100) {
clearInterval(spotStart);
clearInterval(spotStart)
spotifytips()
} else {
$("#spot-m").text(nm);
$("#spot-s").text(ns);
$('#spot-m').text(nm)
$('#spot-s').text(ns)
}
$(".spotify-prog").attr("data-s", news);
$(".spotify-prog").css("width", per + "%");
$('.spotify-prog').attr('data-s', news)
$('.spotify-prog').css('width', per + '%')
}
function trendTagonTipInterval() {
setTimeout(trendTagonTip, 6000000);
setTimeout(trendTagonTip, 6000000)
}
//時計
var clockint;
var clockint
function clock() {
var now = new Date();
var last = 1000 - now.getTime() % 1000;
sleep(last);
clockint = setInterval(clockStart, 1000);
var now = new Date()
var last = 1000 - (now.getTime() % 1000)
sleep(last)
clockint = setInterval(clockStart, 1000)
}
function clockStart() {
var nowTime = new Date(); // 現在日時を得る
var nowHour = nowTime.getHours(); // 時を抜き出す
if (nowHour < 10) { nowHour = "0" + nowHour }
var nowMin = nowTime.getMinutes(); // 分を抜き出す
if (nowMin < 10) { nowMin = "0" + nowMin }
var nowSec = nowTime.getSeconds(); // を抜き出す
if (nowSec < 10) { nowSec = "0" + nowSec }
var msg = nowTime.getFullYear() + "/" + (nowTime.getMonth() + 1) + "/" + nowTime.getDate() + '<span style="font-size:20px; font-family:Open Sans">' + nowHour + ":" + nowMin + ":" + nowSec + "</span>";
$("#tips-text").html(msg);
var nowTime = new Date() // 現在日時を得る
var nowHour = nowTime.getHours() // 時を抜き出す
if (nowHour < 10) {
nowHour = '0' + nowHour
}
var nowMin = nowTime.getMinutes() // を抜き出す
if (nowMin < 10) {
nowMin = '0' + nowMin
}
var nowSec = nowTime.getSeconds() // 秒を抜き出す
if (nowSec < 10) {
nowSec = '0' + nowSec
}
var msg =
nowTime.getFullYear() +
'/' +
(nowTime.getMonth() + 1) +
'/' +
nowTime.getDate() +
'<span style="font-size:20px; font-family:Open Sans">' +
nowHour +
':' +
nowMin +
':' +
nowSec +
'</span>'
$('#tips-text').html(msg)
}
function sleep(waitMsec) {
var startMsec = new Date();
var startMsec = new Date()
while (new Date() - startMsec < waitMsec);
}
function tipsToggle() {
$("#tips").toggleClass("hide");
$("#tips-menu").toggleClass("hide");
$('#tips').toggleClass('hide')
$('#tips-menu').toggleClass('hide')
}
if (localStorage.getItem("tips")) {
tips(localStorage.getItem("tips"));
if (localStorage.getItem('tips')) {
tips(localStorage.getItem('tips'))
}

File diff suppressed because it is too large Load Diff

View File

@@ -52,6 +52,7 @@ function imgChange(imgfile, target) {
httpreq.onreadystatechange = function () {
if (httpreq.readyState === 4) {
var json = httpreq.response;
if(this.status!==200){ setLog(start, this.status, this.response); }
$('#his-data').modal('close');
todc();
localStorage.removeItem("image");

View File

@@ -6,12 +6,12 @@ if (location.search) {
var mode = m[1];
var codex = m[2];
if (mode == "user") {
udgEx(codex, 'main');
udgEx(codex, "main");
}
}
function udgEx(user, acct_id) {
if (user == "selector") {
user = $("#his-acct").attr('fullname');
user = $("#his-acct").attr("fullname");
}
if (acct_id == "selector") {
acct_id = $("#user-acct-sel").val();
@@ -21,28 +21,39 @@ function udgEx(user, acct_id) {
}
console.log("Get user data of " + user);
var domain = localStorage.getItem("domain_" + acct_id);
if (localStorage.getItem("mode_" + domain) == "misskey") { return false; }
if (localStorage.getItem("mode_" + domain) == "misskey") {
return false;
}
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/v1/search?resolve=true&q=" + user
var start = "https://" + domain + "/api/v2/search?resolve=true&q=" + encodeURIComponent(user);
fetch(start, {
method: 'GET',
method: "GET",
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
"content-type": "application/json",
Authorization: "Bearer " + at
}
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
if (json.accounts) {
var id = json.accounts[0].id;
udg(id, acct_id);
} else {
postMessage(["openUrl", url], "*")
}
});
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text);
});
}
return response.json();
})
.catch(function(error) {
todo(error);
setLog(start, "JSON", error);
console.error(error);
})
.then(function(json) {
if (json.accounts[0]) {
var id = json.accounts[0].id;
udg(id, acct_id);
} else {
postMessage(["openUrl", user], "*");
}
});
return true;
}
function udg(user, acct_id) {
@@ -53,155 +64,184 @@ function udg(user, acct_id) {
todo("User Data Loading...");
var domain = localStorage.getItem("domain_" + acct_id);
if (localStorage.getItem("mode_" + domain) == "misskey") {
misskeyUdg(user, acct_id)
misskeyUdg(user, acct_id);
return;
}
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/v1/accounts/" + user;
fetch(start, {
method: 'GET',
method: "GET",
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
//一つ前のユーザーデータ
if (!localStorage.getItem("history")) {
$("#his-history-btn").prop("disabled", true);
} else {
$("#his-history-btn").prop("disabled", false);
$('#his-data').attr("history", localStorage.getItem("history"));
"content-type": "application/json",
Authorization: "Bearer " + at
}
//moved設定時
if (json.moved) {
M.toast({ html: lang.lang_showontl_movetxt + '<button class="btn-flat toast-action" onclick="udg(\'' +
json.moved.id + '\',\'' + acct_id + '\')">' + lang.lang_showontl_movebtn + '</button>', displayLength: 4000 })
}
$('#his-data').modal('open');
$('#his-data').attr("user-id", user);
$('#his-data').attr("use-acct", acct_id);
if (json.username != json.acct) {
//Remote
$('#his-data').attr("remote", "true");
var fullname = json.acct;
} else {
$('#his-data').attr("remote", "false");
var fullname = json.acct + "@" + domain;
}
utl(json.id, '', acct_id);
flw(json.id, '', acct_id);
fer(json.id, '', acct_id);
var dis_name = escapeHTML(json.display_name);
dis_name = twemoji.parse(dis_name);
var note = json.note;
if (json.emojis) {
var actemojick = json.emojis[0];
} else {
var actemojick = false;
}
//絵文字があれば
if (actemojick) {
Object.keys(json.emojis).forEach(function (key5) {
var emoji = json.emojis[key5];
var shortcode = emoji.shortcode;
var emoji_url = '<img src="' + emoji.url +
'" class="emoji-img" data-emoji="' + shortcode + '" draggable="false">';
var regExp = new RegExp(":" + shortcode + ":", "g");
dis_name = dis_name.replace(regExp, emoji_url);
note = note.replace(regExp, emoji_url);
});
}
//noteの解析
//var tags = '<a onclick="tl(\'tag\',\'$1\',' + acct_id +',\'add\')" class="pointer parsed">#$1</a>';
//var mens = '<a onclick="udgEx(\'$1\',' + acct_id +')" class="pointer parsed">@$1</a>';
//note=note.replace(/#(\S+)/gi, tags)
//note=note.replace(/\s@([a-zA-Z_0-9@.-]+)/gi, mens)
$("#his-name").html(dis_name);
$("#his-acct").text(json.acct);
$("#his-acct").attr("fullname", fullname);
$("#his-prof").attr("src", json.avatar);
$('#his-data').css('background-image', 'url(' + json.header + ')');
$("#his-sta").text(json.statuses_count);
$("#his-follow").text(json.following_count);
var flerc = json.followers_count;
if (flerc < 0) {
flerc = "-";
}
$("#his-follower").text(flerc);
$("#his-since").text(crat(json.created_at));
$("#his-openin").attr("data-href", json.url);
if (json.fields) {
if (json.fields.length > 0) {
note = note + '<table id="his-field">'
for (var i = 0; i < json.fields.length; i++) {
var fname = json.fields[i].name;
var fval = json.fields[i].value;
if (json.fields[i].verified_at) {
var when = lang.lang_showontl_verified + ":" + crat(json.fields[i].verified_at);
var color = "rgba(121,189,154,.25);"
} else {
var when = "";
var color = "inherit"
}
note = note + '<tr><td class="his-field-title">' + twemoji.parse(escapeHTML(fname)) + '</td><td class="his-field-content" title="' + when + '" style="background-color:' + color + '">' + twemoji.parse(fval) + '</td></tr>';
}
note = note + '</table>'
$("#his-des").html(twemoji.parse(note));
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text);
});
}
return response.json();
})
.catch(function(error) {
todo(error);
setLog(start, "JSON", error);
console.error(error);
})
.then(function(json) {
//一つ前のユーザーデータ
if (!localStorage.getItem("history")) {
$("#his-history-btn").prop("disabled", true);
} else {
$("#his-des").html(twemoji.parse(note));
$("#his-history-btn").prop("disabled", false);
$("#his-data").attr("history", localStorage.getItem("history"));
}
//moved設定時
if (json.moved) {
M.toast({
html: lang.lang_showontl_movetxt + '<button class="btn-flat toast-action" onclick="udg(\'' + json.moved.id + "','" + acct_id + "')\">" + lang.lang_showontl_movebtn + "</button>",
displayLength: 4000
});
}
$("#his-data").modal("open");
$("#his-data").attr("user-id", user);
$("#his-data").attr("use-acct", acct_id);
if (json.username != json.acct) {
//Remote
$("#his-data").attr("remote", "true");
var fullname = json.acct;
} else {
$("#his-data").attr("remote", "false");
var fullname = json.acct + "@" + domain;
}
utl(json.id, "", acct_id);
flw(json.id, "", acct_id);
fer(json.id, "", acct_id);
var dis_name = escapeHTML(json.display_name);
dis_name = twemoji.parse(dis_name);
var note = json.note;
if (json.emojis) {
var actemojick = json.emojis[0];
} else {
var actemojick = false;
}
//絵文字があれば
if (actemojick) {
Object.keys(json.emojis).forEach(function(key5) {
var emoji = json.emojis[key5];
var shortcode = emoji.shortcode;
var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" draggable="false">';
var regExp = new RegExp(":" + shortcode + ":", "g");
dis_name = dis_name.replace(regExp, emoji_url);
note = note.replace(regExp, emoji_url);
});
}
//noteの解析
//var tags = '<a onclick="tl(\'tag\',\'$1\',' + acct_id +',\'add\')" class="pointer parsed">#$1</a>';
//var mens = '<a onclick="udgEx(\'$1\',' + acct_id +')" class="pointer parsed">@$1</a>';
//note=note.replace(/#(\S+)/gi, tags)
//note=note.replace(/\s@([a-zA-Z_0-9@.-]+)/gi, mens)
$("#his-name").html(dis_name);
$("#his-acct").text(json.acct);
$("#his-acct").attr("fullname", fullname);
$("#his-prof").attr("src", json.avatar);
$("#his-data").css("background-image", "url(" + json.header + ")");
$("#his-sta").text(json.statuses_count);
$("#his-follow").text(json.following_count);
var flerc = json.followers_count;
if (flerc < 0) {
flerc = "-";
}
$("#his-follower").text(flerc);
$("#his-since").text(crat(json.created_at));
$("#his-openin").attr("data-href", json.url);
if (json.fields) {
var table = "";
if (json.fields.length > 0) {
$("#his-des").css("max-height", "250px");
table = '<table id="his-field">';
for (var i = 0; i < json.fields.length; i++) {
var fname = json.fields[i].name;
var fval = json.fields[i].value;
if (json.fields[i].verified_at) {
var when = lang.lang_showontl_verified + ":" + crat(json.fields[i].verified_at);
var color = "rgba(121,189,154,.25);";
} else {
var when = "";
var color = "inherit";
}
table = table + '<tr><td class="his-field-title">' + escapeHTML(fname) + '</td><td class="his-field-content" title="' + when + '" style="background-color:' + color + '">' + fval + "</td></tr>";
}
table = table + "</table>";
$("#his-des").html(twemoji.parse(note));
} else {
$("#his-des").css("max-height", "400px");
}
$("#his-table").html(twemoji.parse(table));
} else {
$("#his-des").css("max-height", "400px");
}
} else {
$("#his-des").html(twemoji.parse(note));
}
if (json.bot) {
$("#his-bot").html(lang.lang_showontl_botacct);
}
$("#his-des").attr("data-acct", acct_id);
$('#his-data').css('background-size', 'cover');
$("#his-data .tab-content").css("height", $("#his-float-timeline").height() - 70 + "px")
localStorage.setItem("history", user);
//自分の時
if (json.acct == localStorage.getItem("user_" + acct_id)) {
showFav('', acct_id);
showBlo('', acct_id);
showMut('', acct_id);
showDom('', acct_id);
showReq('', acct_id);
showFrl('', acct_id);
$("#his-name-val").val(json.display_name);
if (json.fields.length > 0) {
if (json.fields[0]) { $("#his-f1-name").val(json.fields[0].name); $("#his-f1-val").val($.strip_tags(json.fields[0].value)); }
if (json.fields[1]) { $("#his-f2-name").val(json.fields[1].name); $("#his-f2-val").val($.strip_tags(json.fields[1].value)); }
if (json.fields[2]) { $("#his-f3-name").val(json.fields[2].name); $("#his-f3-val").val($.strip_tags(json.fields[2].value)); }
if (json.fields[3]) { $("#his-f4-name").val(json.fields[3].name); $("#his-f4-val").val($.strip_tags(json.fields[3].value)); }
if (json.bot) {
$("#his-bot").html(lang.lang_showontl_botacct);
}
var des = json.note;
des = des.replace(/<br \/>/g, "\n")
des = $.strip_tags(des);
$("#his-des-val").val(des);
$("#his-follow-btn").hide();
$("#his-block-btn").hide();
$("#his-mute-btn").hide();
$("#his-notf-btn").hide();
$("#his-domain-btn").hide();
$("#his-emp-btn").hide();
$(".only-my-data").show();
$(".only-his-data").hide();
} else {
relations(user, acct_id);
$(".only-my-data").hide();
$(".only-his-data").show();
}
todc();
//外部データ取得(死かもしれないので)
udAdd(json.url);
});
$("#his-des").attr("data-acct", acct_id);
$("#his-data").css("background-size", "cover");
$("#his-float-timeline").css("height", $("#his-data-show").height() + "px");
localStorage.setItem("history", user);
//自分の時
if (json.acct == localStorage.getItem("user_" + acct_id)) {
showFav("", acct_id);
showBlo("", acct_id);
showMut("", acct_id);
showDom("", acct_id);
showReq("", acct_id);
showFrl("", acct_id);
$("#his-name-val").val(json.display_name);
if (json.fields.length > 0) {
if (json.fields[0]) {
$("#his-f1-name").val(json.fields[0].name);
$("#his-f1-val").val($.strip_tags(json.fields[0].value));
}
if (json.fields[1]) {
$("#his-f2-name").val(json.fields[1].name);
$("#his-f2-val").val($.strip_tags(json.fields[1].value));
}
if (json.fields[2]) {
$("#his-f3-name").val(json.fields[2].name);
$("#his-f3-val").val($.strip_tags(json.fields[2].value));
}
if (json.fields[3]) {
$("#his-f4-name").val(json.fields[3].name);
$("#his-f4-val").val($.strip_tags(json.fields[3].value));
}
}
var des = json.note;
des = des.replace(/<br \/>/g, "\n");
des = $.strip_tags(des);
$("#his-des-val").val(des);
$("#his-follow-btn").hide();
$("#his-block-btn").hide();
$("#his-mute-btn").hide();
$("#his-notf-btn").hide();
$("#his-domain-btn").hide();
$("#his-emp-btn").hide();
$(".only-my-data").show();
$(".only-his-data").hide();
if (localStorage.getItem("main") == acct_id) {
$("#his-main-acct").hide();
}
} else {
relations(user, acct_id);
$(".only-my-data").hide();
$(".only-his-data").show();
}
todc();
//外部データ取得(死かもしれないので)
udAdd(acct_id, user, json.url);
});
}
function misskeyUdg(user, acct_id) {
reset();
@@ -211,125 +251,137 @@ function misskeyUdg(user, acct_id) {
todo("User Data Loading...");
var domain = localStorage.getItem("domain_" + acct_id);
if (localStorage.getItem("mode_" + domain) != "misskey") {
udg(user, acct_id)
udg(user, acct_id);
return;
}
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/users/show";
fetch(start, {
method: 'POST',
method: "POST",
headers: {
'content-type': 'application/json',
"content-type": "application/json"
},
body: JSON.stringify({
i: at,
userId: user
})
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
//一つ前のユーザーデータ
if (!localStorage.getItem("history")) {
$("#his-history-btn").prop("disabled", true);
} else {
$("#his-history-btn").prop("disabled", false);
$('#his-data').attr("history", localStorage.getItem("history"));
}
$('#his-data').modal('open');
$('#his-data').attr("user-id", user);
$('#his-data').attr("use-acct", acct_id);
if (json.host) {
//Remote
$('#his-data').attr("remote", "false");
var fullname = json.username + "@" + json.host;
} else {
$('#his-data').attr("remote", "false");
var fullname = json.acct + "@" + domain;
}
utl(json.id, '', acct_id);
flw(json.id, '', acct_id);
fer(json.id, '', acct_id);
if (json.name) {
var dis_name = escapeHTML(json.name);
dis_name = twemoji.parse(dis_name);
} else {
var dis_name = json.name
}
$("#his-name").html(dis_name);
$("#his-acct").text(json.username);
$("#his-acct").attr("fullname", fullname);
$("#his-prof").attr("src", json.avatarUrl);
$('#his-data').css('background-image', 'url(' + json.bannerUrl + ')');
$("#his-sta").text(json.notesCount);
$("#his-follow").text(json.followingCount);
$("#his-follower").text(json.followersCount);
$("#his-since").text(crat(json.createdAt));
var note = escapeHTML(json.description);
$("#his-des").html(twemoji.parse(note));
if (json.isCat) {
$("#his-bot").html("Cat" + twemoji.parse("😺"));
}
$('#his-data').css('background-size', 'cover');
localStorage.setItem("history", user);
//自分の時
if (json.username == localStorage.getItem("user_" + acct_id) && !json.host) {
//showFav('', acct_id);
//showMut('', acct_id);
//showReq('', acct_id);
showFrl('', acct_id);
$("#his-name-val").val(json.name);
var des = json.note;
des = nl2br(des)
des = $.strip_tags(des);
$("#his-des-val").val(des);
$("#his-follow-btn").hide();
$("#his-block-btn").hide();
$("#his-mute-btn").hide();
$("#his-notf-btn").hide();
$("#his-domain-btn").hide();
$("#his-emp-btn").hide();
$(".only-my-data").show();
$(".only-his-data").hide();
} else {
if (json.isFollowing) {
//自分がフォローしている
$("#his-data").addClass("following");
$("#his-follow-btn").text(lang.lang_status_unfollow);
hisList(user, acct_id);
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text);
});
}
return response.json();
})
.catch(function(error) {
todo(error);
setLog(start, "JSON", error);
console.error(error);
})
.then(function(json) {
//一つ前のユーザーデータ
if (!localStorage.getItem("history")) {
$("#his-history-btn").prop("disabled", true);
} else {
$("#his-follow-btn").text(lang.lang_status_follow);
$("#his-history-btn").prop("disabled", false);
$("#his-data").attr("history", localStorage.getItem("history"));
}
if (json.isFollowed) {
//フォローされてる
$("#his-relation").text(lang.lang_showontl_followed);
}
$("#his-block-btn").hide();
if (json.isMuted) {
$("#his-data").addClass("muting");
$("#his-mute-btn").text(lang.lang_status_unmute);
$("#his-data").modal("open");
$("#his-data").attr("user-id", user);
$("#his-data").attr("use-acct", acct_id);
if (json.host) {
//Remote
$("#his-data").attr("remote", "false");
var fullname = json.username + "@" + json.host;
} else {
$("#his-mute-btn").text(lang.lang_status_mute);
$("#his-data").attr("remote", "false");
var fullname = json.acct + "@" + domain;
}
$(".only-my-data").hide();
$(".only-his-data").show();
}
todc();
});
utl(json.id, "", acct_id);
flw(json.id, "", acct_id);
fer(json.id, "", acct_id);
if (json.name) {
var dis_name = escapeHTML(json.name);
dis_name = twemoji.parse(dis_name);
} else {
var dis_name = json.name;
}
$("#his-name").html(dis_name);
$("#his-acct").text(json.username);
$("#his-acct").attr("fullname", fullname);
$("#his-prof").attr("src", json.avatarUrl);
$("#his-data").css("background-image", "url(" + json.bannerUrl + ")");
$("#his-sta").text(json.notesCount);
$("#his-follow").text(json.followingCount);
$("#his-follower").text(json.followersCount);
$("#his-since").text(crat(json.createdAt));
var note = escapeHTML(json.description);
$("#his-des").html(twemoji.parse(note));
if (json.isCat) {
$("#his-bot").html("Cat" + twemoji.parse("😺"));
}
$("#his-data").css("background-size", "cover");
localStorage.setItem("history", user);
//自分の時
if (json.username == localStorage.getItem("user_" + acct_id) && !json.host) {
//showFav('', acct_id);
//showMut('', acct_id);
//showReq('', acct_id);
showFrl("", acct_id);
$("#his-name-val").val(json.name);
var des = json.note;
des = nl2br(des);
des = $.strip_tags(des);
$("#his-des-val").val(des);
$("#his-follow-btn").hide();
$("#his-block-btn").hide();
$("#his-mute-btn").hide();
$("#his-notf-btn").hide();
$("#his-domain-btn").hide();
$("#his-emp-btn").hide();
$(".only-my-data").show();
$(".only-his-data").hide();
if (localStorage.getItem("main") == acct_id) {
$("#his-main-acct").hide();
}
} else {
if (json.isFollowing) {
//自分がフォローしている
$("#his-data").addClass("following");
$("#his-follow-btn-text").text(lang.lang_status_unfollow);
hisList(user, acct_id);
} else {
$("#his-follow-btn-text").text(lang.lang_status_follow);
}
if (json.isFollowed) {
//フォローされてる
$("#his-relation").text(lang.lang_showontl_followed);
}
$("#his-block-btn").hide();
if (json.isMuted) {
$("#his-data").addClass("muting");
$("#his-mute-btn-text").text(lang.lang_status_unmute);
} else {
$("#his-mute-btn-text").text(lang.lang_status_mute);
}
$(".only-my-data").hide();
$(".only-his-data").show();
}
todc();
});
}
//一つ前のユーザーデータ表示
function historyShow() {
var acct_id = $('#his-data').attr("use-acct");
var user = $('#his-data').attr("history");
udg(user, acct_id, "true")
var acct_id = $("#his-data").attr("use-acct");
var user = $("#his-data").attr("history");
udg(user, acct_id, "true");
}
//選択アカウントのプロフ
function profShow() {
var acct_id = $("#post-acct-sel").val();
var user = localStorage.getItem("user-id_" + acct_id);
udg(user, acct_id)
udg(user, acct_id);
hide();
}
@@ -339,97 +391,112 @@ function relations(user, acct_id) {
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/v1/accounts/relationships?id=" + user;
fetch(start, {
method: 'GET',
method: "GET",
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
todo(error);
console.error(error);
}).then(function (json) {
var json = json[0];
console.log(json);
if (json.following) {
//自分がフォローしている
$("#his-data").addClass("following");
$("#his-follow-btn").text(lang.lang_status_unfollow);
hisList(user, acct_id);
} else {
$("#his-follow-btn").text(lang.lang_status_follow);
"content-type": "application/json",
Authorization: "Bearer " + at
}
if (json.followed_by) {
//フォローされてる
$("#his-relation").text(lang.lang_showontl_followed);
}
if (json.blocking) {
$("#his-data").addClass("blocking");
$("#his-block-btn").text(lang.lang_status_unblock);
} else {
$("#his-block-btn").text(lang.lang_status_block);
}
if (json.muting) {
$("#his-data").addClass("muting");
$("#his-mute-btn").text(lang.lang_status_unmute);
} else {
$("#his-mute-btn").text(lang.lang_status_mute);
}
if (json.muting_notifications) {
$("#his-data").addClass("mutingNotf");
$("#his-notf-btn").text(lang.lang_showontl_notf + lang.lang_status_unmute);
} else {
$("#his-notf-btn").text(lang.lang_showontl_notf + lang.lang_status_mute);
}
if (json.domain_blocking) {
$("#his-data").addClass("blockingDom");
$("#his-domain-btn").text(lang.lang_showontl_domain + lang.lang_status_unblock);
} else {
$("#his-domain-btn").text(lang.lang_showontl_domain + lang.lang_status_block);
}
//Endorsed
if (json.endorsed) {
$("#his-end-btn").addClass("endorsed");
$("#his-end-btn").text(lang.lang_status_unendorse)
} else {
$("#his-end-btn").removeClass("endorsed");
$("#his-end-btn").text(lang.lang_status_endorse)
}
//Blocked
if (json.blocked_by) {
$("#his-float-timeline").hide();
$("#his-float-blocked").show();
$("#his-follow-btn").hide()
}
});
})
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
setLog(response.url, response.status, text);
});
}
return response.json();
})
.catch(function(error) {
todo(error);
setLog(start, "JSON", error);
console.error(error);
})
.then(function(json) {
var json = json[0];
if (json.following) {
//自分がフォローしている
$("#his-data").addClass("following");
$("#his-follow-btn-text").text(lang.lang_status_unfollow);
hisList(user, acct_id);
} else {
$("#his-follow-btn-text").text(lang.lang_status_follow);
}
if (json.followed_by) {
//フォローされてる
$("#his-relation").text(lang.lang_showontl_followed);
}
if (json.blocking) {
$("#his-data").addClass("blocking");
$("#his-block-btn-text").text(lang.lang_status_unblock);
} else {
$("#his-block-btn-text").text(lang.lang_status_block);
}
if (json.muting) {
$("#his-data").addClass("muting");
$("#his-mute-btn-text").text(lang.lang_status_unmute);
} else {
$("#his-mute-btn-text").text(lang.lang_status_mute);
}
if (json.muting_notifications) {
$("#his-data").addClass("mutingNotf");
$("#his-notf-btn-text").text(lang.lang_showontl_notf + lang.lang_status_unmute);
} else {
$("#his-notf-btn-text").text(lang.lang_showontl_notf + lang.lang_status_mute);
}
if (json.domain_blocking) {
$("#his-data").addClass("blockingDom");
$("#his-domain-btn-text").text(lang.lang_showontl_domain + lang.lang_status_unblock);
} else {
$("#his-domain-btn-text").text(lang.lang_showontl_domain + lang.lang_status_block);
}
//Endorsed
if (json.endorsed) {
$("#his-end-btn").addClass("endorsed");
$("#his-end-btn-text").text(lang.lang_status_unendorse);
} else {
$("#his-end-btn").removeClass("endorsed");
$("#his-end-btn-text").text(lang.lang_status_endorse);
}
//Blocked
if (json.blocked_by) {
$("#my-data-nav .btn").addClass("disabled");
$(".his-var-content").hide();
$("#his-float-blocked").show();
$("#his-follow-btn").hide();
}
});
}
function profbrws() {
var url = $("#his-openin").attr("data-href")
postMessage(["openUrl", url], "*")
var url = $("#his-openin").attr("data-href");
postMessage(["openUrl", url], "*");
}
function setMain() {
var acct_id = $("#his-data").attr("use-acct");
localStorage.setItem("main", acct_id);
multiSelector(true);
M.toast({ html: lang.lang_manager_mainAcct, displayLength: 3000 });
}
//オールリセット
function hisclose() {
$('#his-data').modal('close');
$("#his-data").modal("close");
reset();
$('#his-data').attr("history", "");
$("#his-data").attr("history", "");
localStorage.removeItem("history");
}
function reset() {
$(".tab-content:eq(0)").show();
$(".tab-content:gt(0)").hide();
$(".his-var-content:eq(0)").show();
$(".his-var-content:gt(0)").hide();
$("#my-data-nav .btn").removeClass("disabled");
$(".active-back").removeClass("active-back");
$(".column-first").addClass("active-back");
$("#his-name").text("Loading");
$("#his-acct").text("");
$("#his-prof").attr("src", "../../img/loading.svg");
$('#his-data').css('background-image', 'url(../../img/loading.svg)');
$("#his-data").css("background-image", "url(../../img/loading.svg)");
$("#his-sta").text("");
$("#his-follow").text("");
$("#his-follower").text("");
$("#his-des").html("");
$('#his-data').css('background-size', 'cover');
$("#his-data").css("background-size", "cover");
$("#his-since").text("");
$("#his-data").removeClass("following");
$("#his-data").removeClass("muting");
@@ -437,6 +504,7 @@ function reset() {
$("#his-data").removeClass("mutingNotf");
$("#his-data").removeClass("blockingDom");
$("#his-end-btn").removeClass("endorsed");
$("#his-des").css("max-height", "250px");
$("#his-bot").html("");
$("#his-follow-btn").show();
$("#his-block-btn").show();
@@ -444,32 +512,39 @@ function reset() {
$("#his-notf-btn").show();
$("#his-domain-btn").show();
$("#his-emp-btn").show();
$("#his-follow-btn").text(lang.lang_status_follow);
$("#his-mute-btn").text(lang.lang_status_mute);
$("#his-block-btn").text(lang.lang_status_block);
$("#his-follow-btn-text").text(lang.lang_status_follow);
$("#his-mute-btn-text").text(lang.lang_status_mute);
$("#his-block-btn-text").text(lang.lang_status_block);
$("#his-notf-btn").text(lang.lang_showontl_notf + lang.lang_status_mute);
$("#his-domain-btn").text(lang.lang_showontl_domain + lang.lang_status_block);
$("#his-relation").text("");
$(".cont-series").html("");
$("#domainblock").val("");
$("#his-lists-a").html(lang.lang_showontl_listwarn);
$("#his-lists-b").html('');
$("#his-lists-b").html("");
$("#his-name-val").val("");
$("#his-des-val").val("");
$("#his-f1-name").val(""); $("#his-f1-val").val("");
$("#his-f2-name").val(""); $("#his-f2-val").val("");
$("#his-f3-name").val(""); $("#his-f3-val").val("");
$("#his-f4-name").val(""); $("#his-f4-val").val("");
$("#his-f1-name").val("");
$("#his-f1-val").val("");
$("#his-f2-name").val("");
$("#his-f2-val").val("");
$("#his-f3-name").val("");
$("#his-f3-val").val("");
$("#his-f4-name").val("");
$("#his-f4-val").val("");
$("#his-endorse").html("");
$("#his-openin").attr("data-href", "");
$("#his-float-timeline").show();
$("#his-float-blocked").hide();
$("#his-proof-prof").html("")
$("#his-main-acct").show();
$("#his-proof-prof").html("");
}
$('#my-data-nav .tab').on('click', function () {
var target = $(this).find("a").attr("go");
$("#my-data-nav .tab").removeClass("active-back");
$(this).addClass("active-back");
$(target).show();
$(".tab-content:not(" + target + ")").hide();
});
$("#my-data-nav .anc-link").on("click", function() {
var target = $(this).attr("go");
if (target) {
$("#my-data-nav .anc-link").removeClass("active-back");
$(this).addClass("active-back");
$(target).show();
$(".his-var-content:not(" + target + ")").hide();
}
});

View File

@@ -1,199 +1,327 @@
var dirname = __dirname;
var dir = 'file://' + __dirname;
var base = dir + '/view/';
var dirname = __dirname
var dir = 'file://' + __dirname
var base = dir + '/view/'
// Electronのモジュール
const electron = require("electron");
const fs = require("fs");
const language = require('./main/language.js');
const css = require('./main/css.js');
const dl = require('./main/dl.js');
const img = require('./main/img.js');
const np = require('./main/np.js');
const systemFunc = require('./main/system.js');
const electron = require('electron')
const fs = require('fs')
const language = require('./main/language.js')
const css = require('./main/css.js')
const dl = require('./main/dl.js')
const img = require('./main/img.js')
const np = require('./main/np.js')
const systemFunc = require('./main/system.js')
const Menu = electron.Menu
const join = require('path').join;
const join = require('path').join
// アプリケーションをコントロールするモジュール
const app = electron.app;
const app = electron.app
// ウィンドウを作成するモジュール
const BrowserWindow = electron.BrowserWindow;
const BrowserWindow = electron.BrowserWindow
// メインウィンドウはGCされないようにグローバル宣言
let mainWindow;
var info_path = join(app.getPath("userData"), "window-size.json");
var max_info_path = join(app.getPath("userData"), "max-window-size.json");
var lang_path = join(app.getPath("userData"), "language");
var ha_path = join(app.getPath("userData"), "hardwareAcceleration");
try {
fs.readFileSync(ha_path, 'utf8');
app.disableHardwareAcceleration()
console.log("disabled: HA");
} catch{
console.log("enabled: HA");
let mainWindow
// アプリが多重起動しないようにする
const gotTheLock = app.requestSingleInstanceLock()
if (!gotTheLock) {
app.quit()
} else {
app.on('second-instance', () => {
// 多重起動を試みた場合、既に存在するウィンドウにフォーカスを移す
// Someone tried to run a second instance, we should focus our window.
if (mainWindow) {
if (mainWindow.isMinimized()) mainWindow.restore()
mainWindow.focus()
}
})
}
var window_size;
if (process.argv.indexOf('--dev') === -1) {
var packaged = true
} else {
var packaged = false
console.log(
'||\\\\\\ \n' +
'|||| \\\\\\\\ \n' +
'|||| \\\\\\\\ \n' +
'|||| Am I a \\\\\\\\ \n' +
'|||| cat? ^ ^ \\\\\\\\\\ _____ _ ____ _ \n' +
'|||| (.-.) \\\\\\\\\\ |_ _| |__ ___| _ \\ ___ ___| | __\n' +
"|||| ___> ) ||||| | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n" +
'|||| < _ _) ////// | | | | | | __/ |_| | __/__ \\ < \n' +
'|||| |_||_| ///// |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n' +
'|||| ///// \n' +
'|||| /////\n' +
'|||| /////\n' +
'||||//////'
)
console.log('Welcome!')
}
var info_path = join(app.getPath('userData'), 'window-size.json')
var max_info_path = join(app.getPath('userData'), 'max-window-size.json')
var lang_path = join(app.getPath('userData'), 'language')
var ha_path = join(app.getPath('userData'), 'hardwareAcceleration')
var ua_path = join(app.getPath('userData'), 'useragent')
try {
window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'));
fs.readFileSync(ha_path, 'utf8')
app.disableHardwareAcceleration()
if (!packaged) console.log('disabled: Hardware Acceleration')
} catch {
if (!packaged) console.log('enabled: Hardware Acceleration')
}
var window_size
try {
window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'))
} catch (e) {
window_size = {
width: 1000,
height: 750
}; // デフォルトバリュー
} // デフォルトバリュー
}
var max_window_size;
var max_window_size
try {
max_window_size = JSON.parse(fs.readFileSync(max_info_path, 'utf8'));
max_window_size = JSON.parse(fs.readFileSync(max_info_path, 'utf8'))
} catch (e) {
max_window_size = {
width: "string",
height: "string",
x: "string",
y: "string"
}; // デフォルトバリュー
width: 'string',
height: 'string',
x: 'string',
y: 'string'
} // デフォルトバリュー
}
function isFile(file) {
try {
fs.statSync(file);
fs.statSync(file)
return true
} catch (err) {
if (err.code === 'ENOENT') return false
}
}
// 全てのウィンドウが閉じたら終了
app.on('window-all-closed', function () {
if (process.platform != 'darwin') {
electron.session.defaultSession.clearCache(() => { })
app.quit();
}
});
// macOSでウィンドウを閉じた後に再度開けるようにする
app.on('activate', function () {
if (mainWindow == null) {
createWindow();
}
});
app.on('window-all-closed', function() {
electron.session.defaultSession.clearCache(() => {})
app.quit()
})
function createWindow() {
if (isFile(lang_path)) {
console.log("exist");
var lang = fs.readFileSync(lang_path, 'utf8');
var lang = fs.readFileSync(lang_path, 'utf8')
} else {
var langs = app.getLocale();
console.log(langs);
if (~langs.indexOf("ja")) {
lang = "ja";
var langs = app.getLocale()
console.log(langs)
if (~langs.indexOf('ja')) {
lang = 'ja'
} else if (~langs.indexOf('de')) {
lang = 'de'
} else if (~langs.indexOf('cs')) {
lang = 'cs'
} else if (~langs.indexOf('bg')) {
lang = 'bg'
} else {
lang = "en";
lang = 'en'
}
fs.mkdir(app.getPath("userData"), function (err) {
fs.writeFileSync(lang_path, lang);
});
fs.mkdir(app.getPath('userData'), function(err) {
fs.writeFileSync(lang_path, lang)
})
}
console.log(app.getLocale());
console.log("launch:" + lang);
if (!packaged) console.log('your lang:' + app.getLocale())
if (!packaged) console.log('launch:' + lang)
// メイン画面の表示。ウィンドウの幅、高さを指定できる
var platform = process.platform;
var bit = process.arch;
if (platform == "linux") {
var platform = process.platform
var bit = process.arch
if (platform == 'linux') {
var arg = {
webPreferences: {
webviewTag: true,
nodeIntegration: false,
contextIsolation: true,
preload: join(__dirname, "js", "platform", "preload.js")
preload: join(__dirname, 'js', 'platform', 'preload.js')
},
width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, icon: __dirname + '/desk.png'
width: window_size.width,
height: window_size.height,
x: window_size.x,
y: window_size.y,
icon: __dirname + '/desk.png',
show: false
}
} else if (platform == "win32") {
} else if (platform == 'win32') {
var arg = {
webPreferences: {
webviewTag: true,
nodeIntegration: false,
contextIsolation: true,
preload: join(__dirname, "js", "platform", "preload.js")
preload: join(__dirname, 'js', 'platform', 'preload.js')
},
width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, simpleFullscreen: true
width: window_size.width,
height: window_size.height,
x: window_size.x,
y: window_size.y,
simpleFullscreen: true,
show: false
}
} else if (platform == "darwin") {
} else if (platform == 'darwin') {
var arg = {
webPreferences: {
webviewTag: true,
nodeIntegration: false,
contextIsolation: true,
preload: join(__dirname, "js", "platform", "preload.js")
preload: join(__dirname, 'js', 'platform', 'preload.js')
},
width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, simpleFullscreen: true
width: window_size.width,
height: window_size.height,
x: window_size.x,
y: window_size.y,
simpleFullscreen: true,
show: false
}
}
mainWindow = new BrowserWindow(arg);
electron.session.defaultSession.clearCache(() => { })
mainWindow = new BrowserWindow(arg)
mainWindow.once('page-title-updated', () => {
mainWindow.show()
if (window_size.max) {
mainWindow.maximize()
}
})
if (!packaged) mainWindow.toggleDevTools()
electron.session.defaultSession.clearCache(() => {})
if (process.argv) {
if (process.argv[1]) {
var m = process.argv[1].match(/([a-zA-Z0-9]+)\/\?[a-zA-Z-0-9]+=(.+)/);
var m = process.argv[1].match(/([a-zA-Z0-9]+)\/\?[a-zA-Z-0-9]+=(.+)/)
if (m) {
var mode = m[1];
var code = m[2];
var plus = '?mode=' + mode + '&code=' + code;
var mode = m[1]
var code = m[2]
var plus = '?mode=' + mode + '&code=' + code
} else {
var plus = "";
var plus = ''
}
} else {
var plus = "";
var plus = ''
}
} else {
var plus = "";
var plus = ''
}
mainWindow.loadURL(base + lang + '/index.html' + plus);
var ua
try {
ua = fs.readFileSync(ua_path, 'utf8')
} catch (e) {
//default UA Example:
// Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) thedesk/18.11.3 Chrome/76.0.3809.146 Electron/6.0.12 Safari/537.36
const crypto = require('crypto')
const N = 100
var ua =
'Mastodon client: ' +
crypto
.randomBytes(N)
.toString('base64')
.substring(0, N)
}
mainWindow.loadURL(base + lang + '/index.html' + plus, { userAgent: ua })
if (!window_size.x && !window_size.y) {
mainWindow.center();
}
if (window_size.max) {
mainWindow.maximize();
mainWindow.center()
}
// ウィンドウが閉じられたらアプリも終了
mainWindow.on('closed', function () {
electron.ipcMain.removeAllListeners();
mainWindow = null;
});
mainWindow.on('close', function () {
mainWindow.on('closed', function() {
electron.ipcMain.removeAllListeners()
mainWindow = null
})
closeArg = false
mainWindow.on('close', function(e, arg) {
writePos(mainWindow)
if (!closeArg) {
e.preventDefault()
}
const promise = new Promise(function(resolve) {
mainWindow.webContents.send('asReadEnd', '')
setTimeout(function() {
resolve()
}, 3000)
})
promise.then(function(response) {
closeArg = true
mainWindow.close()
})
})
electron.ipcMain.on('sendMarkersComplete', function(e, arg) {
closeArg = true
mainWindow.close()
})
function writePos(mainWindow) {
if (
max_window_size.width == mainWindow.getBounds().width &&
max_window_size.height == mainWindow.getBounds().height &&
max_window_size.x == mainWindow.getBounds().x &&
max_window_size.y == mainWindow.getBounds().y
) {
var size = { width: mainWindow.getBounds().width, height: mainWindow.getBounds().height, x: mainWindow.getBounds().x, y: mainWindow.getBounds().y, max: true }
var size = {
width: mainWindow.getBounds().width,
height: mainWindow.getBounds().height,
x: mainWindow.getBounds().x,
y: mainWindow.getBounds().y,
max: true
}
} else {
var size = { width: mainWindow.getBounds().width, height: mainWindow.getBounds().height, x: mainWindow.getBounds().x, y: mainWindow.getBounds().y }
var size = {
width: mainWindow.getBounds().width,
height: mainWindow.getBounds().height,
x: mainWindow.getBounds().x,
y: mainWindow.getBounds().y
}
}
fs.writeFileSync(info_path, JSON.stringify(size));
});
mainWindow.on('maximize', function () {
fs.writeFileSync(max_info_path, JSON.stringify(mainWindow.getBounds()));
});
var platform = process.platform;
var bit = process.arch;
if (process.argv.indexOf("--dev") === -1) {
packaged = true;
} else {
packaged = false;
fs.writeFileSync(info_path, JSON.stringify(size))
}
Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir)));
mainWindow.on('maximize', function() {
writePos(mainWindow)
fs.writeFileSync(max_info_path, JSON.stringify(mainWindow.getBounds()))
})
mainWindow.on('minimize', function() {
writePos(mainWindow)
mainWindow.webContents.send('asRead', '')
})
var platform = process.platform
var bit = process.arch
Menu.setApplicationMenu(
Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname))
)
//CSS
css.css(mainWindow);
css.css(mainWindow)
//アップデータとダウンロード
dl.dl(mainWindow, lang_path, base, dirname);
dl.dl(mainWindow, lang_path, base, dirname)
//画像選択と画像処理
img.img(mainWindow, dir);
img.img(mainWindow, dir)
//NowPlaying
np.TheDeskNowPlaying(mainWindow);
np.TheDeskNowPlaying(mainWindow)
//その他system
systemFunc.system(mainWindow, dir, lang, dirname);
systemFunc.system(mainWindow, dir, lang, dirname)
setInterval(function() {
mouseTrack(mainWindow)
}, 1000)
}
var x = 0
var y = 0
var unchanged = 0
var locked = false
function mouseTrack(mainWindow) {
let mousePos = electron.screen.getCursorScreenPoint()
let xNow = mousePos.x
let yNow = mousePos.x
if (x != xNow || y != yNow) {
unchanged = 0
locked = false
} else {
unchanged++
if (unchanged > 60 && !locked) {
unchanged = 0
locked = true
mainWindow.webContents.send('asRead', '')
}
}
x = xNow
y = yNow
}
// Electronの初期化完了後に実行
app.on('ready', createWindow);
var onError = function (err, response) {
console.error(err, response);
};
app.on('ready', createWindow)
var onError = function(err, response) {
console.error(err, response)
}
app.setAsDefaultProtocolClient('thedesk')

View File

@@ -23,7 +23,7 @@ function css(mainWindow) {
ipc.on('theme-json-create', function (e, arg) {
var themecss = join(app.getPath("userData"), JSON5.parse(arg)["id"] +
".thedesktheme");
fs.writeFileSync(themecss, JSON.stringify(JSON5.parse(arg)));
fs.writeFileSync(themecss, JSON5.stringify(JSON5.parse(arg)));
if (JSON5.parse(arg)["id"]) {
e.sender.webContents.send('theme-json-create-complete', "");
} else {
@@ -39,13 +39,14 @@ function css(mainWindow) {
})
ipc.on('theme-json-request', function (e, arg) {
var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
e.sender.webContents.send('theme-json-response', json);
var raw = fs.readFileSync(themecss, 'utf8')
var json = JSON5.parse(raw);
e.sender.webContents.send('theme-json-response', [json, raw]);
})
ipc.on('theme-css-request', function (e, arg) {
var themecss = join(app.getPath("userData"), arg + ".thedesktheme");
try {
var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'));
var primary = json.vars.primary;
var secondary = json.vars.secondary;
@@ -53,29 +54,68 @@ function css(mainWindow) {
if (json.base == "light") {
var drag = "rgba(255, 255, 255, 0.8)";
var beforehover = "#757575";
var selected = "#3f3f3f"
var selectedWithShare = "#b2babd"
var gray = "#757575"
} else {
var drag = "rgba(0, 0, 0, 0.8)";
var beforehover = "#9e9e9e";
var selected = "#c0c0c0"
var selectedWithShare = "#003a30"
var gray = "#cccccc"
}
if (json.props) {
if (json.props.TheDeskAccent) {
var emphasized = json.props.TheDeskAccent
} else {
var emphasized = secondary;
var emphasized = secondary
}
if (json.props.TheDeskActive) {
var active = json.props.TheDeskActive
} else {
var active = primary
}
if (json.props.TheDeskModal) {
var modal = json.props.TheDeskModal
} else {
var modal = secondary
}
if (json.props.TheDeskBottom) {
var bottom = json.props.TheDeskBottom
} else {
var bottom = primary
}
if (json.props.TheDeskPostbox) {
var postbox = json.props.TheDeskPostbox
} else {
var postbox = primary
}
if (json.props.TheDeskSubcolor) {
var subcolor = json.props.TheDeskSubcolor
} else {
var subcolor = primary
}
} else {
var emphasized = primary;
var emphasized = primary
var acs = secondary
var active = primary
var modal = secondary
var bottom = primary
var postbox = primary
var subcolor = primary
}
var css = ".customtheme {--bg:" + secondary + ";--drag:" + drag + ";" +
"--color:" + text + ";--beforehover:" + beforehover + ";--modal:" +
secondary + ";--subcolor:" + primary + ";--box:" + primary +
";--sidebar:" + primary + ";--shared:" + emphasized + ";" +
"--notfbox:" + secondary + ";--emphasized:" + primary + ";--his-data:" +
modal + ";--subcolor:" + subcolor + ";--box:" + subcolor +
";--sidebar:" + bottom + ";--shared:" + emphasized + ";" +
"--notfbox:" + secondary + ";--emphasized:" + active + ";--his-data:" +
secondary +
";--active:" + primary + ";--postbox:" + primary + ";--modalfooter:" +
";--active:" + active + ";--postbox:" + postbox + ";--modalfooter:" +
primary +
";}.blacktheme #imagemodal{background: url(\"../img/pixel.svg\");}";
";--accentbtn:" + subcolor + ";--selected:" + selected + ";--selectedWithShare:" + selectedWithShare + "}"+
"--gray:" + gray + ";"+
".customtheme #imagemodal{background: url(\"../img/pixel.svg\");}";
e.sender.webContents.send('theme-css-response', css);
} catch (e) {
var css = "";
@@ -84,15 +124,19 @@ function css(mainWindow) {
})
ipc.on('theme-json-list', function (e, arg) {
fs.readdir(app.getPath("userData"), function (err, files) {
if (err) throw err;
if (err || !files) throw err;
var fileList = files.filter(function (file) {
var tfile = join(app.getPath("userData"), file);
return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile); //絞り込み
if(file.match(/\.thedesktheme$/)){
var tfile = join(app.getPath("userData"), file)
return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile)
}else{
return null
}
})
var themes = [];
for (var i = 0; i < fileList.length; i++) {
var themecss = join(app.getPath("userData"), fileList[i]);
var json = JSON.parse(fs.readFileSync(themecss, 'utf8'));
var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'));
themes.push({
name: json.name,
id: json.id

View File

@@ -26,11 +26,9 @@ function dl(mainWindow, lang_path, base, dirname) {
"transparent": false, // ウィンドウの背景を透過
"frame": false, // 枠の無いウィンドウ
"resizable": false
});
//updatewin.openDevTools()
})
var lang = fs.readFileSync(lang_path, 'utf8');
updatewin.loadURL(base + lang + '/update.html');
return "true"
} else {
return false;

View File

@@ -1,43 +1,92 @@
function img(mainWindow, dir) {
const electron = require("electron");
const dialog = electron.dialog;
const fs = require("fs");
var Jimp = require("jimp");
var ipc = electron.ipcMain;
const BrowserWindow = electron.BrowserWindow;
ipc.on('file-select', (e, args) => {
dialog.showOpenDialog(null, {
properties: ['openFile', 'multiSelections'],
title: '添付ファイルを選択',
defaultPath: '.',
filters: [
{ name: 'メディアファイル', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg', 'mp4', 'webm'] },
{ name: '画像', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg'] },
{ name: '動画', extensions: ['mp4', 'webm'] },
{ name: '全てのファイル', extensions: ['*'] }
]
}, (fileNames) => {
if (!fileNames) {
return false;
}
for (var i = 0; i < fileNames.length; i++) {
var path = fileNames[i];
var bin = fs.readFileSync(path, 'base64');
e.sender.webContents.send('bmp-img-comp', [bin, 'new']);
}
});
});
ipc.on('bmp-image', (e, args) => {
var m = args[0].match(/(.+)\\(.+)\.(.+)$/);
Jimp.read(args[0], function (err, lenna) {
if (err) throw err;
lenna.getBase64(Jimp.MIME_PNG, function (err, src) {
e.sender.webContents.send('bmp-img-comp', [src, args[1]]);
});
});
});
const electron = require('electron')
const dialog = electron.dialog
const fs = require('fs')
var Jimp = require('jimp')
var ipc = electron.ipcMain
const BrowserWindow = electron.BrowserWindow
ipc.on('file-select', (e, args) => {
dialog.showOpenDialog(
null,
{
properties: ['openFile', 'multiSelections'],
title: '添付ファイルを選択',
defaultPath: '.',
filters: [
{
name: 'メディアファイル',
extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg', 'mp4', 'webm']
},
{ name: '画像', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg'] },
{ name: '動画', extensions: ['mp4', 'webm'] },
{ name: '全てのファイル', extensions: ['*'] }
]
},
fileNames => {
if (!fileNames) {
return false
}
for (var i = 0; i < fileNames.length; i++) {
var path = fileNames[i]
var bin = fs.readFileSync(path, 'base64')
e.sender.webContents.send('resizeJudgement', [bin, 'new'])
}
}
)
})
ipc.on('bmp-image', (e, args) => {
Jimp.read(args[0], function(err, lenna) {
if (err) throw err
lenna.getBase64(Jimp.MIME_PNG, function(err, src) {
e.sender.webContents.send('bmp-img-comp', [src, args[1]])
})
})
})
ipc.on('resize-image', (e, args) => {
var ext = args[0].toString().slice(args[0].indexOf('/') + 1, args[0].indexOf(';'))
if (ext == 'jpeg') {
var use = 'MIME_JPEG'
} else {
var use = 'MIME_PNG'
}
var b64 = args[0].replace(/^data:\w+\/\w+;base64,/, '')
var decodedFile = new Buffer(b64, 'base64')
Jimp.read(decodedFile, function(err, lenna) {
if (err) throw err
lenna.scaleToFit(args[1], args[1]).getBase64(Jimp[use], function(err, src) {
e.sender.webContents.send('bmp-img-comp', [src, args[1]])
})
})
})
ipc.on('stamp-image', (e, args) => {
var text = args[1]
var b64 = args[0].replace(/^data:\w+\/\w+;base64,/, '')
var decodedFile = new Buffer(b64, 'base64')
console.log(text)
Jimp.read(decodedFile, function(err, image) {
if (err) throw err
Jimp.loadFont(Jimp.FONT_SANS_16_BLACK).then(font => {
var evWidth = Jimp.measureText(font, text)
var width = image.bitmap.width
var height = image.bitmap.height
var left = width - evWidth - 10
var top = height - 30
var color = Jimp.intToRGBA(image.getPixelColor(left, top))
console.log(left, top, color)
var ave = (color.r + color.g + color.b) / 3
if (ave > 128) {
image.print(font, left, top, args[1]).getBase64(Jimp.MIME_PNG, function(err, src) {
e.sender.webContents.send('bmp-img-comp', [src, args[1], true])
})
} else {
Jimp.loadFont(Jimp.FONT_SANS_16_WHITE).then(font => {
image.print(font, left, top, args[1]).getBase64(Jimp.MIME_PNG, function(err, src) {
e.sender.webContents.send('bmp-img-comp', [src, args[1], true])
})
})
}
})
})
})
}
exports.img = img;
exports.img = img

View File

@@ -1,8 +1,12 @@
// Create the Application's main menu
function templete(lang, mainWindow, packaged, dir) {
function templete(lang, mainWindow, packaged, dir, dirname) {
if(lang !="ja" && lang != "en"){
lang = "en"
}
const electron = require("electron");
const app = electron.app;
const BrowserWindow = electron.BrowserWindow;
const join = require('path').join;
const dict = {
"application": {
"ja": "アプリケーション",
@@ -98,9 +102,9 @@ function templete(lang, mainWindow, packaged, dir) {
webviewTag: false,
nodeIntegration: false,
contextIsolation: true,
preload: "../js/platform/preload.js"
preload: join(dirname , "js", "platform", "preload.js")
},
width: 300, height: 460,
width: 300, height: 500,
"transparent": false, // ウィンドウの背景を透過
"frame": false, // 枠の無いウィンドウ
"resizable": false

View File

@@ -1,71 +1,35 @@
function np(mainWindow) {
const electron = require("electron");
const join = require('path').join;
const app = electron.app;
const fs = require("fs");
var ipc = electron.ipcMain;
ipc.on('itunes', async (e, args) => {
//Verified on Windows
console.log("Access");
if (args[0] == "set") {
var { NowPlaying, PlayerName } = require("nowplaying-node");
var nppath = join(app.getPath("userData"), "nowplaying");
var npProvider;
try {
npProvider = args[1];
} catch (e) {
npProvider = "AIMP";
}
var myAIMP = new NowPlaying({
fetchCover: true,
player: PlayerName[npProvider],
});
fs.writeFileSync(nppath, npProvider);
} else {
var platform = process.platform;
var bit = process.arch;
if (platform == "darwin") {
try {
const nowplaying = require("itunes-nowplaying-mac");
const value = await nowplaying.getRawData();
e.sender.webContents.send('itunes-np', value);
} catch (error) {
// エラーを返す
console.error(error);
e.sender.webContents.send('itunes-np', error);
}
} else {
var { NowPlaying, PlayerName } = require("nowplaying-node");
var nppath = join(app.getPath("userData"), "nowplaying");
var npProvider;
try {
npProvider = fs.readFileSync(nppath, 'utf8');
} catch (e) {
npProvider = "AIMP";
}
var myAIMP = new NowPlaying({
fetchCover: true,
player: PlayerName[npProvider],
});
myAIMP.update();
var path = myAIMP.getCoverPath();
if (path) {
var bin = fs.readFileSync(path, 'base64');
} else {
var bin = false;
}
var value = {
win: true,
name: myAIMP.getTitle(),
artist: myAIMP.getArtist(),
album: myAIMP.getAlbum(),
path: bin
}
e.sender.webContents.send('itunes-np', value);
}
}
});
const electron = require('electron')
const ipc = electron.ipcMain
ipc.on('itunes', async (e, args) => {
console.log('Access')
if (args[0] == 'set') {
} else {
var platform = process.platform
var bit = process.arch
if (platform == 'darwin') {
try {
const nowplaying = require('itunes-nowplaying-mac')
let value = await nowplaying()
try {
const artwork = await nowplaying.getThumbnailBuffer(value.databaseID)
if(artwork) {
const base64 = artwork.toString('base64')
value.artwork = base64
e.sender.webContents.send('itunes-np', value)
}
} catch (error) {
console.error(error)
e.sender.webContents.send('itunes-np', value)
}
} catch (error) {
console.error(error)
}
} else {
}
}
})
}
exports.TheDeskNowPlaying = np;
exports.TheDeskNowPlaying = np

View File

@@ -1,148 +1,159 @@
function system(mainWindow, dir, lang, dirname) {
const electron = require("electron");
const app = electron.app;
const join = require('path').join;
const join = require("path").join;
var Jimp = require("jimp");
const fs = require("fs");
var JSON5 = require("json5");
var ipc = electron.ipcMain;
const clipboard = electron.clipboard;
var tmp_img = join(app.getPath("userData"), "tmp.png");
var ha_path = join(app.getPath("userData"), "hardwareAcceleration");
var ua_path = join(app.getPath("userData"), "useragent");
var lang_path = join(app.getPath("userData"), "language");
var log_dir_path = join(app.getPath("userData"), "logs");
//ログ
var today = new Date();
//今日のやつ
var todayStr = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate() + ".log";
//昨日のやつ
today.setDate(today.getDate() - 1);
var yestStr = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate() + ".log";
//一昨日のやつ
today.setDate(today.getDate() - 1);
var yest2Str = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate() + ".log";
const BrowserWindow = electron.BrowserWindow;
const dialog = electron.dialog;
const os = require('os')
const os = require("os");
const language = require("../main/language.js");
ipc.on('native-notf', function (e, args) {
var platform = process.platform;
var bit = process.arch;
if (platform == "win32") {
const notifier = require('node-notifier')
var tmp_imge = tmp_img;
Jimp.read(args[2], function (err, lenna) {
if (!err && lenna) {
lenna.write(tmp_img);
var tmp_imge = tmp_img;
} else {
var tmp_imge = "";
}
notifier.notify({
appID: "top.thedesk",
message: args[1],
title: args[0],
icon: tmp_imge,
sound: false,
wait: true,
},
function (err, response) {
console.log(err, response)
});
});
}
});
//プラットフォーム
ipc.on('getPlatform', function (e, arg) {
e.sender.webContents.send('platform', [process.platform, process.arch, process.version, process.versions.chrome, process.versions.electron]);
})
ipc.on("getPlatform", function(e, arg) {
try {
var gitHash = fs.readFileSync("git", "utf8");
} catch {
var gitHash = null;
}
e.sender.webContents.send("platform", [process.platform, process.arch, process.version, process.versions.chrome, process.versions.electron, gitHash]);
});
//言語
ipc.on('lang', function (e, arg) {
ipc.on("lang", function(e, arg) {
console.log("set:" + arg);
fs.writeFileSync(lang_path, arg);
e.sender.webContents.send('langres', "");
})
e.sender.webContents.send("langres", arg);
});
//エクスポートのダイアログ
ipc.on('exportSettings', function (e, args) {
dialog.showSaveDialog(null, {
title: 'Export',
properties: ['openFile', 'createDirectory'],
defaultPath: "export.thedeskconfigv2"
}, (savedFiles) => {
if (!savedFiles) {
return false;
ipc.on("exportSettings", function(e, args) {
dialog.showSaveDialog(
mainWindow,
{
title: "Export",
properties: ["openFile", "createDirectory"],
defaultPath: "export.thedeskconfig.json5"
},
savedFiles => {
if (!savedFiles) {
return false;
}
e.sender.webContents.send("exportSettingsFile", savedFiles);
}
e.sender.webContents.send('exportSettingsFile', savedFiles);
})
})
);
});
//インポートのダイアログ
ipc.on('importSettings', function (e, args) {
dialog.showOpenDialog(null, {
title: 'Import',
properties: ['openFile'],
filters: [
{ name: 'TheDesk Config', extensions: ['thedeskconfig', 'thedeskconfigv2'] },
]
}, (fileNames) => {
if (!fileNames) {
return false;
ipc.on("importSettings", function(e, args) {
dialog.showOpenDialog(
mainWindow,
{
title: "Import",
properties: ["openFile"],
filters: [{ name: "TheDesk Config", extensions: ["thedeskconfig", "thedeskconfigv2", "json5"] }]
},
fileNames => {
console.log("imported from: ", fileNames)
if (!fileNames) {
return false;
}
e.sender.webContents.send("config", JSON5.parse(fs.readFileSync(fileNames[0], "utf8")));
}
e.sender.webContents.send('config', fs.readFileSync(arg, 'utf8'));
})
})
);
});
//保存フォルダのダイアログ
ipc.on('savefolder', function (e, args) {
dialog.showOpenDialog(null, {
title: 'Save folder',
properties: ['openDirectory'],
}, (fileNames) => {
e.sender.webContents.send('savefolder', fileNames[0]);
});
})
ipc.on("savefolder", function(e, args) {
dialog.showOpenDialog(
mainWindow,
{
title: "Save folder",
properties: ["openDirectory"]
},
fileNames => {
e.sender.webContents.send("savefolder", fileNames[0]);
}
);
});
//カスタムサウンドのダイアログ
ipc.on('customSound', function (e, arg) {
dialog.showOpenDialog(null, {
title: 'Custom sound',
properties: ['openFile'],
filters: [
{ name: 'Audio', extensions: ['mp3', 'aac', 'wav', 'flac', 'm4a'] },
{ name: 'All', extensions: ['*'] },
]
}, (fileNames) => {
e.sender.webContents.send('customSoundRender', [arg, fileNames[0]]);
});
})
ipc.on("customSound", function(e, arg) {
dialog.showOpenDialog(
mainWindow,
{
title: "Custom sound",
properties: ["openFile"],
filters: [{ name: "Audio", extensions: ["mp3", "aac", "wav", "flac", "m4a"] }, { name: "All", extensions: ["*"] }]
},
fileNames => {
e.sender.webContents.send("customSoundRender", [arg, fileNames[0]]);
}
);
});
//ハードウェアアクセラレーションの無効化
ipc.on('ha', function (e, arg) {
ipc.on("ha", function(e, arg) {
if (arg == "true") {
fs.writeFileSync(ha_path, arg);
} else {
fs.unlink(ha_path, function (err) { });
fs.unlink(ha_path, function(err) {});
}
app.relaunch()
app.exit()
})
app.relaunch();
app.exit();
});
ipc.on("ua", function(e, arg) {
if (arg == "") {
fs.unlink(ua_path, function(err) {});
} else {
fs.writeFileSync(ua_path, arg);
}
app.relaunch();
app.exit();
});
ipc.on('quit', (e, args) => {
ipc.on("quit", (e, args) => {
app.quit();
});
ipc.on('about', (e, args) => {
ipc.on("about", (e, args) => {
about();
});
function about() {
var ver = app.getVersion()
var ver = app.getVersion();
var window = new BrowserWindow({
webPreferences: {
webviewTag: false,
nodeIntegration: false
nodeIntegration: false,
contextIsolation: true,
preload: join(dirname, "js", "platform", "preload.js")
},
width: 300,
height: 480,
"transparent": false, // ウィンドウの背景を透過
"frame": false, // 枠の無いウィンドウ
"resizable": false
height: 500,
transparent: false, // ウィンドウの背景を透過
frame: false, // 枠の無いウィンドウ
resizable: false
});
window.loadURL(dir + '/about.html?ver=' + ver);
return "true"
window.loadURL(dir + "/about.html?ver=" + ver);
return "true";
}
ipc.on('nano', function (e, x, y) {
var nano_info_path = join(app.getPath("userData"),
"nano-window-position.json");
ipc.on("nano", function(e, x, y) {
var nano_info_path = join(app.getPath("userData"), "nano-window-position.json");
var window_pos;
try {
window_pos = JSON.parse(fs.readFileSync(nano_info_path, 'utf8'));
window_pos = JSON.parse(fs.readFileSync(nano_info_path, "utf8"));
} catch (e) {
window_pos = [0, 0]; // デフォルトバリュー
}
@@ -151,43 +162,43 @@ function system(mainWindow, dir, lang, dirname) {
webviewTag: false,
nodeIntegration: false,
contextIsolation: true,
preload: join(dirname,"js", "platform", "preload.js")
preload: join(dirname, "js", "platform", "preload.js")
},
width: 350,
height: 200,
"transparent": false, // ウィンドウの背景を透過
"frame": false, // 枠の無いウィンドウ
"resizable": false
height: 140,
transparent: false, // ウィンドウの背景を透過
frame: false, // 枠の無いウィンドウ
resizable: false
});
nanowindow.loadURL(dir + '/nano.html');
nanowindow.loadURL(dir + "/nano.html");
nanowindow.setAlwaysOnTop(true);
//nanowindow.toggleDevTools()
nanowindow.setPosition(window_pos[0], window_pos[1]);
nanowindow.on('close', function () {
nanowindow.on("close", function() {
fs.writeFileSync(nano_info_path, JSON.stringify(nanowindow.getPosition()));
});
return true;
})
});
var cbTimer1;
ipc.on('startmem', (e, arg) => {
event = e.sender
ipc.on("startmem", (e, arg) => {
event = e.sender;
cbTimer1 = setInterval(mems, 1000);
});
function mems() {
var mem = os.totalmem() - os.freemem();
if (mainWindow) {
event.webContents.send('memory', [mem, os.cpus()[0].model, os.totalmem()]);
event.webContents.send("memory", [mem, os.cpus()[0].model, os.totalmem()]);
}
}
ipc.on('endmem', (e, arg) => {
ipc.on("endmem", (e, arg) => {
if (cbTimer1) {
clearInterval(cbTimer1);
}
});
ipc.on('export', (e, args) => {
fs.writeFileSync(args[0], args[1]);
ipc.on("export", (e, args) => {
fs.writeFileSync(args[0], JSON5.stringify(args[1]));
e.sender.webContents.send("exportAllComplete", "");
});
//フォント
function object_array_sort(data, key, order, fn) {
@@ -195,12 +206,13 @@ function system(mainWindow, dir, lang, dirname) {
var num_a = -1;
var num_b = 1;
if (order === 'asc') { //指定があれば昇順(ASC)
if (order === "asc") {
//指定があれば昇順(ASC)
num_a = 1;
num_b = -1;
}
data = data.sort(function (a, b) {
data = data.sort(function(a, b) {
var x = a[key];
var y = b[key];
if (x > y) return num_a;
@@ -211,7 +223,7 @@ function system(mainWindow, dir, lang, dirname) {
//重複排除
var arrObj = {};
for (var i = 0; i < data.length; i++) {
arrObj[data[i]['family']] = data[i];
arrObj[data[i]["family"]] = data[i];
}
data = [];
@@ -221,12 +233,69 @@ function system(mainWindow, dir, lang, dirname) {
fn(data); // ソート後の配列を返す
}
ipc.on('fonts', (e, arg) => {
const fm = require('font-manager');
ipc.on("fonts", (e, arg) => {
const fm = require("font-manager");
var fonts = fm.getAvailableFontsSync();
object_array_sort(fonts, 'family', 'asc', function (fonts_sorted) {
e.sender.webContents.send('font-list', fonts_sorted);
object_array_sort(fonts, "family", "asc", function(fonts_sorted) {
e.sender.webContents.send("font-list", fonts_sorted);
});
});
//コピー
ipc.on("copy", (e, arg) => {
clipboard.writeText(arg);
});
//ログ
ipc.on("log", (e, arg) => {
var today = new Date();
var todayStr = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate();
var log_path = join(log_dir_path, todayStr + ".log");
fs.appendFile(log_path, "\n" + arg, function(err) {
if (err) {
throw err;
}
});
});
ipc.on("getLogs", (e, arg) => {
var logs=""
var todayLog=""
var yestLog=""
var yest2Log=""
fs.readdir(log_dir_path, function(err, files) {
if (err) throw err;
files.filter(function(file) {
if (file == todayStr) {
todayLog=fs.readFileSync(join(log_dir_path, file), "utf8")
}
if (file == yestStr) {
yestLog=logs+fs.readFileSync(join(log_dir_path, file), "utf8")
}
if (file == yest2Str) {
yest2Log=fs.readFileSync(join(log_dir_path, file), "utf8")
}
logs = todayLog + yestLog + yest2Log;
});
logs = yest2Log + yestLog + todayLog;
e.sender.webContents.send("logData", logs);
});
});
//起動時ログディレクトリ存在確認と作成、古ログ削除
fs.access(log_dir_path, fs.constants.R_OK | fs.constants.W_OK, error => {
if (error) {
if (error.code === "ENOENT") {
fs.mkdirSync(log_dir_path);
} else {
return;
}
} else {
fs.readdir(log_dir_path, function(err, files) {
if (err) throw err;
files.filter(function(file) {
if (file != todayStr && file != yestStr && file != yest2Str) {
fs.unlinkSync(join(log_dir_path, file));
}
});
});
}
});
}
exports.system = system;
exports.system = system;

View File

@@ -1,240 +1,155 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<link href="./css/themes.css" type="text/css" rel="stylesheet">
<link href="./css/tl.css" type="text/css" rel="stylesheet">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<title>TheDesk Nano</title>
<style>
html {
-webkit-app-region: drag !important;
cursor: move !important;
width: 100vw;
height: 100vh;
overflow: hidden;
font-family: sans-serif;
}
body {
background-color: rgba(0, 0, 0, 0.1);
font-size: 11px;
}
#timeline_nano {
overflow-y: scroll;
overflow-x: hidden;
-webkit-app-region: no-drag;
max-height: 100px;
}
.user {
font-size: 12px;
}
select {
-webkit-app-region: no-drag;
}
button {
-webkit-app-region: no-drag;
}
textarea {
-webkit-app-region: no-drag;
}
::-webkit-scrollbar {
width: 5px;
height: 10px;
background: rgba(0, 0, 0, 0.05);
}
::-webkit-scrollbar-track {
-webkit-border-radius: 5px;
border-radius: 5px;
}
.area-actions {
display: none !important;
}
.area-date_via {
display: none !important;
}
.area-side {
display: none !important;
}
/* Handle */
::-webkit-scrollbar-thumb {
-webkit-border-radius: 5px;
border-radius: 5px;
background: rgba(0, 0, 0, 0.8);
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
}
.blacktheme body {
color: white;
background-color: #212121;
}
.blacktheme button {
background-color: black;
color: white;
}
.blacktheme textarea,
.blacktheme select {
color: white;
}
.blacktheme select,
.blacktheme option {
background-color: black;
}
</style>
</head>
<body>
<script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
<script>
$.strip_tags = function (str, allowed) {
if (!str) {
return "";
<head>
<meta charset="utf-8" />
<link href="./css/themes.css" type="text/css" rel="stylesheet" />
<link href="./css/tl.css" type="text/css" rel="stylesheet" />
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
<link href="./node_modules/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet">
<title>TheDesk Nano</title>
<style>
html {
-webkit-app-region: drag !important;
cursor: move !important;
width: 100vw;
height: 100vh;
overflow: hidden;
font-family: sans-serif;
color: var(--color) !important;
}
allowed = (((allowed || '') + '').toLowerCase().match(/<[a-z][a-z0-9]*>/g) || [])
.join('');
var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>?/gi,
commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi;
return str.replace(commentsAndPhpTags, '').replace(tags, function ($0, $1) {
return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : '';
});
};
function escapeHTML(str) {
if (!str) {
return "";
}
return str.replace(/&/g, '&amp;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/"/g, '&quot;')
.replace(/'/g, '&#039;');
}
</script>
<script type="text/javascript" src="./js/platform/first-not-view.js"></script>
<select id="post-acct-sel" style="max-width:150px">
</select>
<select id="type-sel" style="max-width:60px">
<option value="local">Local</option>
<option value="home">Home</option>
</select><button onclick="tl()">Show</button><button onclick="window.close()">x</button><br>
<div id="timeline_nano">
</div>
<br>
<textarea id="textarea" style="width:80%; background-color:transparent"></textarea>
<button class="btn" onclick="post()">Post</button>
<script>
if (localStorage.getItem("lang")) {
var lang = localStorage.getItem("lang");
} else {
var lang = "ja";
}
</script>
<script src="https://twemoji.maxcdn.com/2/twemoji.min.js?2.7"></script>
<script type="text/javascript" src="./js/post/post.js"></script>
<script type="text/javascript" src="./js/post/use-txtbox.js"></script>
<script type="text/javascript" src="./js/tl/parse.js"></script>
<script type="text/javascript" src="./js/ui/theme.js"></script>
<script type="text/javascript" src="./js/tl/date.js"></script>
<script type="text/javascript" src="./js/common/time.js"></script>
<script type="text/javascript" src="./js/platform/nano.js"></script>
<script type="text/javascript" src="./js/platform/end.js"></script>
<script>
var multi = localStorage.getItem("multi");
if (!multi) {
var obj = [{
at: localStorage.getItem(localStorage.getItem("domain_" + acct_id) + "_at"),
name: localStorage.getItem("name_" + acct_id),
domain: localStorage.getItem("domain_" + acct_id),
user: localStorage.getItem("user_" + acct_id),
prof: localStorage.getItem("prof_" + acct_id)
}];
var json = JSON.stringify(obj);
localStorage.setItem("multi", json);
} else {
var obj = JSON.parse(multi);
}
var templete;
var last = localStorage.getItem("last-use");
var sel;
Object.keys(obj).forEach(function (key) {
var acct = obj[key];
var list = key * 1 + 1;
if (key == last) {
sel = "selected";
} else {
sel = "";
body {
background-color: rgba(0, 0, 0, 0.1);
font-size: 11px;
}
templete = '<option value="' + key + '" ' + sel + '>' + acct.user + '@' + acct.domain +
'</option>';
$("#post-acct-sel").append(templete);
});
function mov() {
return false;
}
function resetmv() {
return false;
}
function post() {
var acct_id = $("#post-acct-sel").val();
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_" + acct_id + "_at");
var start = "https://" + domain + "/api/v1/statuses";
var str = $("#textarea").val();
var toot = {
status: str
#timeline_nano {
overflow-y: scroll;
overflow-x: hidden;
-webkit-app-region: no-drag;
max-height: 100px;
}
var vis = loadVis(acct_id)
toot.visibility = vis;
var httpreq = new XMLHttpRequest();
httpreq.open('POST', start, true);
httpreq.setRequestHeader('Content-Type', 'application/json');
httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
httpreq.responseType = "json";
httpreq.send(JSON.stringify(toot));
httpreq.onreadystatechange = function () {
if (httpreq.readyState === 4) {
$("#textarea").val("");
.user {
font-size: 12px;
}
select {
-webkit-app-region: no-drag;
}
button {
-webkit-app-region: no-drag;
}
textarea {
-webkit-app-region: no-drag;
color: var(--color) !important;
}
::-webkit-scrollbar {
width: 5px;
height: 10px;
background: rgba(0, 0, 0, 0.05);
}
::-webkit-scrollbar-track {
-webkit-border-radius: 5px;
border-radius: 5px;
}
.area-date_via {
display: none !important;
}
.area-side {
display: none !important;
}
/* Handle */
::-webkit-scrollbar-thumb {
-webkit-border-radius: 5px;
border-radius: 5px;
background: rgba(0, 0, 0, 0.8);
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
}
.hide, .pin, .rep-btn, .tickers{
display: none;
}
.fas {
font-size: 1rem !important;
}
.cvo {
grid-template-rows: auto 1rem 1fr auto 2rem;
}
</style>
</head>
<body>
<script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
<script>
$.strip_tags = function(str, allowed) {
if (!str) {
return "";
}
}
}
function loadVis(acct_id) {
var vist = localStorage.getItem("vis");
console.log(vist);
if (!vist) {
return "public";
} else {
if (vist == "memory") {
var memory = localStorage.getItem("vis-memory-" + acct_id);
if (!memory) {
memory = "public";
}
return memory;
} else if (vist == "server") {
var multi = localStorage.getItem("multi");
var obj = JSON.parse(multi);
var memory = obj[acct_id]["vis"];
if (!memory) {
memory = "public";
}
return memory;
} else {
return vist;
allowed = (((allowed || "") + "").toLowerCase().match(/<[a-z][a-z0-9]*>/g) || []).join("");
var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>?/gi,
commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi;
return str.replace(commentsAndPhpTags, "").replace(tags, function($0, $1) {
return allowed.indexOf("<" + $1.toLowerCase() + ">") > -1 ? $0 : "";
});
};
function escapeHTML(str) {
if (!str) {
return "";
}
return str
.replace(/&/g, "&amp;")
.replace(/</g, "&lt;")
.replace(/>/g, "&gt;")
.replace(/"/g, "&quot;")
.replace(/'/g, "&#039;");
}
}
</script>
</script>
<script type="text/javascript" src="./js/platform/first-not-view.js"></script>
<div id="menu" class="hide">
TL and posting account<br>
<select id="post-acct-sel" style="max-width:150px"> </select><br>
TL type<br>
<select id="type-sel" style="max-width:60px" onchange="loader()">
<option value="local">Local</option>
<option value="home">Home</option> </select
><button onclick="tl()">Show</button><br>
Visibility<br>
<select id="vis-sel" style="max-width:60px">
<option value="public">Public</option>
<option value="unlisted">Unlisted</option>
<option value="private">Private</option>
</select>
</div>
<button onclick="set()" id="setting">Setting</button>
<textarea id="textarea" style="width:55%; background-color:transparent" placeholder="Post someyhing new"></textarea>
<button class="btn" onclick="post()">Post</button>
<button onclick="window.close()">x</button><br />
<div id="timeline_nano">Click "settings" to show TL</div>
<br />
<script>
if (localStorage.getItem("lang")) {
var lang = localStorage.getItem("lang");
} else {
var lang = "ja";
}
</script>
<script src="https://twemoji.maxcdn.com/2/twemoji.min.js?2.7"></script>
<script type="text/javascript" src="view/en/main.js"></script>
<script type="text/javascript" src="./js/post/status.js"></script>
<script type="text/javascript" src="./js/post/post.js"></script>
<script type="text/javascript" src="./js/post/use-txtbox.js"></script>
<script type="text/javascript" src="./js/tl/parse.js"></script>
<script type="text/javascript" src="./js/ui/theme.js"></script>
<script type="text/javascript" src="./js/tl/date.js"></script>
<script type="text/javascript" src="./js/common/time.js"></script>
<script type="text/javascript" src="./js/platform/nano.js"></script>
<script type="text/javascript" src="./js/platform/end.js"></script>
</body>
</html>

View File

@@ -1,18 +1,19 @@
{
"name": "thedesk",
"version": "18.6.5",
"version": "20.1.1",
"description": "TheDesk is a Mastodon client for PC.",
"repository": "https://github.com/cutls/TheDesk",
"main": "main.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"construct": "cd view/make && node make",
"dev": "electron ./ --dev",
"construct": "cd view/make && node make --automatic && cd ../../",
"dev": "npx electron ./ --dev",
"dist": "build --linux snap",
"watchview": "node view/make/make.js --automatic --watch",
"build:js": "node build.js",
"build": "electron-builder",
"build:all": "electron-builder --win --linux",
"build:win": "electron-builder --win"
"build": "npx electron-builder",
"build:all": "npx electron-builder --win --linux",
"build:win": "npx electron-builder --win"
},
"keywords": [
"mastodon",
@@ -43,31 +44,34 @@
},
{
"name": "kPherox",
"url": "https://pawoo.net/@kPherox",
"url": "https://pl.kpherox.dev/kPherox",
"email": "admin@mail.kr-kp.com"
}
],
"license": "GPL-3.0",
"dependencies": {
"electron-dl": "^1.14.0",
"jimp": "^0.6.4",
"@fortawesome/fontawesome-free": "^5.11.2",
"electron-dl": "^3.0.0",
"jimp": "^0.9.1",
"jquery": "^3.4.1",
"json5": "^2.1.0",
"materialize-css": "^1.0.0",
"node-notifier": "^5.4.0",
"sumchecker": "^3.0.0",
"sweetalert2": "^8.13.0",
"jquery-ui-dist": "^1.12.1",
"materialize-css": "git://github.com/cutls/materialize",
"json5": "^2.1.1",
"lodash": "^4.17.15",
"sumchecker": "^3.0.1",
"sweetalert2": "^9.5.4",
"vue": "^2.6.10"
},
"optionalDependencies": {
"nowplaying-node": "git+https://github.com/cutls/nowplaying-node",
"itunes-nowplaying-mac": "git+https://github.com/rinsuki/itunes-nowplaying-mac#pull/4/head",
"font-manager": "^0.3.0"
"font-manager": "0.3.0",
"itunes-nowplaying-mac": "0.3.1"
},
"devDependencies": {
"electron": "^5.0.4",
"electron-builder": "^20.44.4",
"readline-sync": "1.4.9"
"chokidar": "^3.3.0",
"electron": "^7.1.8",
"electron-builder": "^22.1.0",
"electron-rebuild": "^1.8.8",
"readline-sync": "1.4.10"
},
"build": {
"productName": "TheDesk",
@@ -105,7 +109,8 @@
"icon": "build/icons",
"target": [
"zip",
"snap"
"snap",
"deb"
],
"category": "Network"
},
@@ -116,8 +121,8 @@
]
},
"electronDownload": {
"version": "5.0.1"
"version": "6.0.0"
},
"electronVersion": "5.0.1"
"electronVersion": "6.0.0"
}
}

94
app/source/version.json Normal file
View File

@@ -0,0 +1,94 @@
{
"latest":[],
"3.0.0": [
"プロフィールディレクトリの表示",
"ホワイトリスト式のトレンドタグ(3.0の機能)",
"Featuredハッシュタグの追加",
"ホームタイムラインと通知タイムラインの未読管理",
"自分がどの選択肢に投票したかを表示"
],
"2.9.3": [],
"2.9.2": [],
"2.9.1": ["オーディオのアップロードと再生"],
"2.9.0": ["ユーザーごとの通知のフィルター"],
"2.8.4": [],
"2.8.3": [],
"2.8.2": [],
"2.8.1": ["blurhashによる閲覧注意画像表示"],
"2.8.0": [
"アンケートの作成と投票",
"keybase等のアカウント認証対応",
"検索のオフセット等",
"ブロックされているアカウントを表示したときに「ブロックされています」と表示",
"公開範囲を指定してブースト"
],
"2.7.4": [],
"2.7.3": [],
"2.7.2": [],
"2.7.1": [],
"2.7.0": ["プロフィールディレクトリのユーザー追加", "時間指定投稿"],
"2.6.5": [],
"2.6.4": [],
"2.6.3": [],
"2.6.2": [],
"2.6.1": [],
"2.6.0": [
"ダイレクトメールだけのタイムラインの表示",
"詳細画面の「これより後のタイムライン」の利用",
"タイムラインにおけるカードの表示"
],
"2.5.2": [],
"2.5.1": [],
"2.5.0": ["リプライ数のカウント", "プロフィールに紹介する"],
"2.4.5": [],
"2.4.4": [],
"2.4.3": ["フィルター機能", "フォローレコメンデーション"],
"2.4.2": [],
"2.4.1": [
"削除して再編集の画像を下書きに戻す",
"検索時のトゥート数のグラフ等の表示(v2 search)",
"トゥート内のURLからトゥートやアカウントの情報を開く",
"設定ページから製作者のアカウント情報を開く",
"TheDeskお知らせに添付されたトゥートを開く",
"Glance TLやtootsearchのトゥートやアカウント情報を表示する"
],
"2.4.0": [
"プロフィールのフィールド(4つの項目)を見る",
"プロフィールにカスタム絵文字を使用する"
],
"2.3.3": [],
"2.3.2": [],
"2.3.1": [],
"2.3.0": [
"トゥートに埋め込まれたYouTubeやニコ動などをその場で再生する",
"ローカル(メディア)と連合(メディア)タイムライン"
],
"2.2.0": [],
"2.1.3": [],
"2.1.2": [],
"2.1.0": [
"リスト機能",
"アカウント移行機能(移行された通知)",
"Glance TLのストリーミング"
],
"2.0.0": ["カスタム絵文字"],
"1.6.1": [],
"1.6.0": ["トゥートのピン留め"],
"1.5.1": [],
"1.5.0": [
"Mastodonのサーバー規定値による投稿範囲の変更",
"Mastodonのサーバー規定値による閲覧注意画像設定"
],
"1.4.7": [],
"1.4.6": [],
"1.4.5": [],
"1.4.4": [],
"1.4.3": [],
"1.4.2": [],
"1.4.1": ["ユーザーによるドメインブロック"],
"1.3.3": [],
"1.3.2": [],
"1.3.1": [],
"1.3.0": [],
"oldest":[]
}

View File

@@ -1,159 +0,0 @@
<!doctype html>
<html lang="en">
<head>
<title>Account Manager - TheDesk</title>
<meta content="width=device-width,initial-scale=1.0" name="viewport">
<link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
<link href="../../css/themes.css" type="text/css" rel="stylesheet">
<link href="../../css/master.css" type="text/css" rel="stylesheet">
<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
<link href='../../css/tl.css' rel='stylesheet' type='text/css'>
<link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
<style>
.acct {
display: flex;
justify-content: space-around;
}
.card {
width: 400px;
background-color: #9e9e9e;
margin: 10px;
}
body,
html {
overflow-y: scroll;
}
#acct-list {
display: flex;
flex-wrap: wrap;
color: white;
align-items: flex-start
}
.lts {
font-size: 150%
}
.colorsel {
display: flex;
}
.card .colorsel div:not(.exc) {
width: 20px;
height: 20px;
}
.card .colorsel div.exc {
width: 40px;
height: 20px;
}
.first {
display: flex;
justify-content: center;
align-items: center
}
.first .hide-first {
display: none;
}
</style>
<meta charset="utf-8">
<!--
<script type="text/javascript">
var _jipt = [];
_jipt.push(['project', 'thedesk']);
</script>
<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
-->
</head>
<body id="mainView">
<script type="text/javascript" src="../../node_modules/jquery/dist/jquery.js"></script>
<script type="text/javascript" src="../../js/platform/first.js"></script>
<script type="text/javascript" src="../../node_modules/materialize-css/dist/js/materialize.js"></script>
<script type="text/javascript" src="../../js/lang/lang.en.js"></script>
<script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
<script>
var misskeytoken = false;
</script>
<script type="text/javascript" src="../../js/ui/tips.js"></script>
<script type="text/javascript" src="../../js/common/time.js"></script>
<script type="text/javascript" src="../../js/common/modal.js"></script>
<div class="hide-first">
<a href="index.html" class="btn waves-effect orange nex"
style="width:100%; max-width:200px;">Back</a><br>
<h5>List of accounts</h5>
<div id="acct-list"></div>
<div class="divider"></div>
</div>
<div>
<h5>Add an account</h5><br>
<div id="add">
<div class="row">
<div class="col s8">
<input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp">
<div id="ins-suggest"></div>
Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)<br>
<label>
<input type="checkbox" class="filled-in" id="linux" />
<span>Code setup</span>
</label>
<br>
<label>
<input type="checkbox" class="filled-in" id="misskey" />
<span>Login as Misskey</span>
</label><br>
<button class="btn waves-effect" onclick="instance()">Login</button><br>
</div>
<div class="col s4">
<span style="font-family:Open Sans;">Supports</span>
<div id="support" class="collection transparent"></div>
</div>
</div>
</div>
<div id="auth" style="display:none">
Paste the code and close browser.<br>
<input type="text" id="code" placeholder="Code">
<button class="btn waves-effect" onclick="code()">Auth</button><br>
</div>
<div id="misskeylogin" style="display:none">
<h5>AppSecret</h5>
Read <a href="https://thedesk.top/how-to-misskey-login.html">Docs(ja)</a> to login Misskey.<br>
<input type="hidden" id="misskey-url">
<input type="text" id="misskey-key" placeholder="Code">
<button class="btn waves-effect" onclick="misskeyLogin()">Auth</button><br>
</div>
</div>
<div class="hide-first">
<h5>Main an account</h5>
<div class="input-field" style="width:300px"><span data-trans="your_acct">Select an account</span>
<br>
<select id="main-acct-sel" class="acct-sel" style="color:black" onchange="mainacct()"></select>
<label></label>
</div>
Some instance data by <a href="https://instances.social" target="_blank">instances.social API</a><br>
<h5 id="ins-title"></h5>
Administered by:<a id="ins-admin"></a><br>
<span id="ins-desc"></span><br>
<img src="../../img/loading.svg" id="ins-prof" width="200"><br>
<br>
Domain:<span id="ins-name"></span><br>
Federated servers:<span id="ins-connect"></span><br>
Toots:<span id="ins-toot"></span><br>
Users:<span id="ins-user"></span>Users<br>
Connection:<span id="ins-per"></span>%<br>
Mastodon version:<span id="ins-ver"></span>@<span id="ins-upd"></span><br>
</div>
<script type="text/javascript" src="../../js/ui/theme.js"></script>
<script type="text/javascript" src="../../js/platform/end.js"></script>
<script type="text/javascript" src="../../js/common/sha256.js"></script>
<script type="text/javascript" src="../../js/login/tkn.js"></script>
<script type="text/javascript" src="../../js/login/instance.js"></script>
<script type="text/javascript" src="../../js/login/manager.js"></script>
<script type="text/javascript" src="../../js/tl/date.js"></script>

File diff suppressed because it is too large Load Diff

View File

@@ -1,900 +0,0 @@
<!doctype html>
<html lang="ja">
<head>
<title>OSS License - TheDesk</title>
<meta content="width=device-width,initial-scale=1.0" name="viewport">
<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
<link href="../../css/themes.css" type="text/css" rel="stylesheet">
<link href="../../css/master.css" type="text/css" rel="stylesheet">
<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans|IBM+Plex+Mono" rel="stylesheet">
<meta charset="utf-8">
</head>
<body style="overflow-y:scroll;">
<script type="text/javascript" src="../../js/common/jquery.js"></script>
<script type="text/javascript" src="../../js/platform/first.js"></script>
<script type="text/javascript" src="../../js/common/materialize.js"></script>
<a href="setting.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i class="material-icons left">undo</i>Back</a>
LICENSE of TheDesk:<a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">TheDesk LICENSE (Latest Ver.)</a><br>
<article style="width:500px; max-width:100%; margin:15px; font-family:Arial,Helvetica">
<h5>TheDesk</h5>
<i class="fa fa-github"></i><a href="https://github.com/cutls/TheDesk" target="_blank">cutls/TheDesk</a><br>
<p style="text-align:center">GNU GENERAL PUBLIC LICENSE<br>
Version 3, 29 June 2007</p>
<a onclick="$('#thedesk,.trigger').toggleClass('hide')" class="pointer trigger">Show(About 5000 words)</a><br>
<div class="hide" id="thedesk">
<a onclick="$('#thedesk,.trigger').toggleClass('hide')" class="pointer trigger hide">Hide</a><br>
Copyright (C) 2007 Free Software Foundation, Inc. &lt; http://fsf.org/ &gt;
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.<br>
<br>
<p style="text-align:center">Preamble</p>
<br>
The GNU General Public License is a free, copyleft license for
software and other kinds of works.<br>
<br>
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.<br>
<br>
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.<br>
<br>
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.<br>
<br>
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.<br>
<br>
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.<br>
<br>
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.<br>
<br>
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.<br>
<br>
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.<br>
<br>
The precise terms and conditions for copying, distribution and
modification follow.<br>
<br>
<p style="text-align:center">TERMS AND CONDITIONS</p>
<br>
0. Definitions.<br>
<br>
"This License" refers to version 3 of the GNU General Public License.<br>
<br>
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.<br>
<br>
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.<br>
<br>
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.<br>
<br>
A "covered work" means either the unmodified Program or a work based
on the Program.<br>
<br>
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.<br>
<br>
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.<br>
<br>
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.<br>
<br>
1. Source Code.<br>
<br>
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.<br>
<br>
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.<br>
<br>
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.<br>
<br>
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.<br>
<br>
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.<br>
<br>
The Corresponding Source for a work in source code form is that
same work.<br>
<br>
2. Basic Permissions.<br>
<br>
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.<br>
<br>
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.<br>
<br>
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.<br>
<br>
3. Protecting Users' Legal Rights From Anti-Circumvention Law.<br>
<br>
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.<br>
<br>
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.<br>
<br>
4. Conveying Verbatim Copies.<br>
<br>
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.<br>
<br>
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.<br>
<br>
5. Conveying Modified Source Versions.<br>
<br>
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:<br>
<br>
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.<br>
<br>
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".<br>
<br>
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.<br>
<br>
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.<br>
<br>
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.<br>
<br>
6. Conveying Non-Source Forms.<br>
<br>
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:<br>
<br>
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.<br>
<br>
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.<br>
<br>
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.<br>
<br>
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.<br>
<br>
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.<br>
<br>
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.<br>
<br>
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.<br>
<br>
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.<br>
<br>
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).<br>
<br>
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.<br>
<br>
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.<br>
<br>
7. Additional Terms.<br>
<br>
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.<br>
<br>
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.<br>
<br>
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:<br>
<br>
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or<br>
<br>
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or<br>
<br>
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or<br>
<br>
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or<br>
<br>
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or<br>
<br>
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.<br>
<br>
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.<br>
<br>
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.<br>
<br>
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.<br>
<br>
8. Termination.<br>
<br>
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).<br>
<br>
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.<br>
<br>
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.<br>
<br>
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.<br>
<br>
9. Acceptance Not Required for Having Copies.<br>
<br>
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.<br>
<br>
10. Automatic Licensing of Downstream Recipients.<br>
<br>
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.<br>
<br>
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.<br>
<br>
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.<br>
<br>
11. Patents.<br>
<br>
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".<br>
<br>
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.<br>
<br>
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.<br>
<br>
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.<br>
<br>
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.<br>
<br>
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.<br>
<br>
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.<br>
<br>
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.<br>
<br>
12. No Surrender of Others' Freedom.<br>
<br>
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.<br>
<br>
13. Use with the GNU Affero General Public License.<br>
<br>
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.<br>
<br>
14. Revised Versions of this License.<br>
<br>
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.<br>
<br>
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.<br>
<br>
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.<br>
<br>
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.<br>
<br>
15. Disclaimer of Warranty.<br>
<br>
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.<br>
<br>
16. Limitation of Liability.<br>
<br>
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.<br>
<br>
17. Interpretation of Sections 15 and 16.<br>
<br>
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.<br>
<br>
<p style="text-align:center">END OF TERMS AND CONDITIONS</p>
<p style="text-align:center">How to Apply These Terms to Your New Programs</p>
<br>
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.<br>
<br>
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.<br>
<br>
&lt;one line to give the program's name and a brief idea of what it does.&gt;
Copyright (C) &lt;year&gt; &lt;name of author&gt;<br>
<br>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.<br>
<br>
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.<br>
<br>
You should have received a copy of the GNU General Public License
along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.<br>
<br>
Also add information on how to contact you by electronic and paper mail.<br>
<br>
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:<br>
<br>
&lt;program&gt; Copyright (C) &lt;year&gt; &lt;name of author&gt;
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.<br>
<br>
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".<br>
<br>
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
&lt;http://www.gnu.org/licenses/&gt;.<br>
<br>
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
&lt; http://www.gnu.org/philosophy/why-not-lgpl.html &gt;.<br>
<br>
<a onclick="$('#thedesk,.trigger').toggleClass('hide')" class="pointer trigger hide">Hide</a>
</div>
<h5>Electron</h5>
<i class="fa fa-github"></i><a href="https://github.com/electron/electron" target="_blank">electron/electron</a><br>
Copyright (c) 2013-2018 GitHub Inc.<br>
<br>
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:<br>
<br>
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
<br>
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.<br>
<h5>electron-dl</h5>
<i class="fa fa-github"></i><a href="https://github.com/sindresorhus/electron-dl" target="_blank">sindresorhus/electron-dl</a><br>
MIT License<br>
Copyright (c) Sindre Sorhus &lt;sindresorhus@gmail.com&gt; (sindresorhus.com)<br>
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:<br>
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.<br>
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
THE USE OR OTHER DEALINGS IN THE SOFTWARE.<br>
<h5>Jimp</h5>
<i class="fa fa-github"></i><a href="https://github.com/oliver-moran/jimp" target="_blank">oliver-moran/jimp</a><br>
The MIT License (MIT)<br>
<br>
Copyright (c) 2014 Oliver Moran<br>
<br>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:<br>
<br>
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.<br>
<br>
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.<br>
<h5>Twitter Emoji (Twemoji)</h5>
<i class="fa fa-github"></i><a href="https://github.com/twitter/twemoji" target="_blank">twitter/twemoji</a><br>
Copyright (c) 2018 Twitter, Inc and other contributors<br>
<br>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:<br>
<br>
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.<br>
<br>
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. <br>
<br>
<h5>Font Awesome</h5>
<i class="fa fa-github"></i><a href="https://github.com/FortAwesome/Font-Awesome" target="_blank">FortAwesome/Font-Awesome</a><br>
Font Awesome Free License<br>
-------------------------<br>
<br>
Font Awesome Free is free, open source, and GPL friendly. You can use it for
commercial projects, open source projects, or really almost whatever you want.
Full Font Awesome Free license: https://fontawesome.com/license.<br>
<br>
# Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/)<br>
In the Font Awesome Free download, the CC BY 4.0 license applies to all icons
packaged as SVG and JS file types.<br>
<br>
# Fonts: SIL OFL 1.1 License (https://scripts.sil.org/OFL)<br>
In the Font Awesome Free download, the SIL OLF license applies to all icons
packaged as web and desktop font files.<br>
<br>
# Code: MIT License (https://opensource.org/licenses/MIT)<br>
In the Font Awesome Free download, the MIT license applies to all non-font and
non-icon files.<br>
<br>
# Attribution<br>
Attribution is required by MIT, SIL OLF, and CC BY licenses. Downloaded Font
Awesome Free files already contain embedded comments with sufficient
attribution, so you shouldn't need to do anything additional when using these
files normally.<br>
<br>
We've kept attribution comments terse, so we ask that you do not actively work
to remove them from files, especially code. They're a great way for folks to
learn about Font Awesome.<br>
<br>
# Brand Icons<br>
All brand icons are trademarks of their respective owners. The use of these
trademarks does not indicate endorsement of the trademark holder by Font
Awesome, nor vice versa. **Please do not use brand logos for any purpose except
to represent the company, product, or service to which they refer.**<br>
<h5>node-notifier</h5>
<i class="fa fa-github"></i><a href="https://github.com/mikaelbr/node-notifier" target="_blank">mikaelbr/node-notifier</a><br>
MIT License<br>
<br>
Copyright (c) 2017 Mikael Brevik<br>
<br>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:<br>
<br>
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.<br>
<br>
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.<br>
<h5>itunes-nowplaying-mac</h5>
<i class="fa fa-github"></i><a href="https://github.com/rinsuki/itunes-nowplaying-mac" target="_blank">rinsuki/itunes-nowplaying-mac</a><br>
MIT LICENSE
<h5>Google Fonts</h5>
<ul>
<li>Open Sans:<a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0"> Apache License, Version 2.0 </a></li>
<li>Material Icons:<a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0"> Apache License, Version 2.0 </a></li>
<li>IBM Plex Mono:<a target="_blank" href="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;id=OFL_web"> Open Font License </a></li>
</ul>
<h5>emoji-data</h5>
The MIT License (MIT)<br>
<br>
Copyright (c) 2013 Cal Henderson<br>
<br>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:<br>
<br>
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.<br>
<br>
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.<br>
<h5>#InstanceTicker</h5>
The MIT License (MIT)<br>
<br>
ORIGINAL CSS © 小田急don <a href="https://odakyu.app/@ars42525">https://odakyu.app/@ars42525</a><br>
#InstanceTicker © weep.me <a href="https://weep.me/@weep">https://weep.me/@weep</a><br>
<br>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:<br>
<br>
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.<br>
<br>
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.<br>
</article>
<a href="setting.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i class="material-icons left">undo</i>Back</a>
<script type="text/javascript" src="../../js/ui/theme.js"></script>
<script type="text/javascript" src="../../js/platform/end.js"></script>
</body>

View File

@@ -1,500 +0,0 @@
<!doctype html>
<html lang="en" style="overflow:scroll">
<head>
<title>Settings - TheDesk</title>
<!--
<script type="text/javascript">
var _jipt = [];
_jipt.push(['project', 'thedesk']);
</script>
<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
-->
<meta content="width=device-width,initial-scale=1.0" name="viewport">
<link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
<link href="../../css/themes.css" type="text/css" rel="stylesheet">
<link href="../../css/pickr.css" type="text/css" rel="stylesheet">
<link href="../../css/master.css" type="text/css" rel="stylesheet">
<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
<meta charset="utf-8">
<style>
input {
max-height: 50px !important
}
.pcr-result {
height: 1rem !important;
}
</style>
</head>
<body id="mainView" style="overflow-y:scroll">
<script type="text/javascript" src="../../node_modules/jquery/dist/jquery.js"></script>
<script type="text/javascript" src="../../js/platform/first.js"></script>
<script type="text/javascript" src="../../node_modules/materialize-css/dist/js/materialize.js"></script>
<script type="text/javascript" src="../../js/lang/lang.en.js"></script>
<script src="https://unpkg.com/json5@^2.0.0/dist/index.min.js"></script>
<script src="../../node_modules/vue/dist/vue.min.js"></script>
<script type="text/javascript" src="setting.vue.js"></script>
<script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
<h4>Preferences</h4>
<ul class="collapsible" data-collapsible="accordion">
<li>
<div class="collapsible-header">
<i class="material-icons">desktop_windows</i>System Preferences
</div>
<div class="collapsible-body">
<h5>Languages</h5>
To translate with Crowdin, you have to login Crowdin and restart TheDesk when login is finished.<br>
<a onclick="changelang('ja')" class="pointer" style="margin-right:5px;">日本語</a><a onclick="changelang('en')" class="pointer" style="margin-right:5px;">English</a><a onclick="changelang('ps')" class="pointer" style="margin-right:5px;">Crowdin translate system(beta)</a>
<h5>Import and export of preferences</h5>
<button onclick="exportSettings()" class="btn waves-effect lime darken-3"
style="width:100%; max-width:200px;">Export</button>
<button onclick="importSettings()" class="btn waves-effect cyan darken-3"
style="width:100%; max-width:200px;">Import</button>
<div id="envView">
<template v-for="(item, i) in config">
<h5>{{item.text.head}}</h5>
<template v-if="item.text.desc">
<templete v-html="item.text.desc"></templete><br>
</template>
<template v-if="item.id=='notf'"><a onclick="notftest()"
class="pointer">Notification test</a><br></template>
<template v-if="item.checkbox">
<template v-for="(check, j) in item.text.checkbox">
<label>
<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
<span>{{check.text}}</span>
</label>
</template>
</template>
<template v-else>
<template v-if="item.doubleText">
<template v-for="(textbox, j) in item.data">
<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
</template>
</template>
<template v-else>
<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
</template>
<button class="btn waves-effect" style="width:100px;"
v-on:click="complete(i)">Change</button>
</template><br>
</template>
</div>
<h5>Font</h5>
Select your favorite font to 'Select'(Windows/ macOS only)<br>
<button class="btn waves-effect" style="width:100px;" onclick="font()">Select</button><br>
<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;"></div>
<br>
<input type="text" style="width:150px" id="font">
<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
<br>
<h5>Folder to save</h5>
TheDesk uses this value when it try to save pictures or take screenshots.<br>
<button class="btn waves-effect" style="width:100px;" onclick="savefolder()">Change</button>
<br>
</div>
</li>
<li>
<div class="collapsible-header">
<i class="material-icons">color_lens</i>Themes
</div>
<div class="collapsible-body">
<h4>Select theme</h4>
<label>
<input class="with-gap" onchange="settings()" name="theme" type="radio" id="black" value="black" />
<span>Black</span>
</label>
<label>
<input class="with-gap" onchange="settings()" name="theme" type="radio" id="white" value="white" />
<span>White</span>
</label>
<label>
<input class="with-gap" onchange="settings()" name="theme" type="radio" id="indigo"
value="indigo" />
<span>Indigo<span class="imas hide">(エンドレスナイト)</span></span>
</label>
<label>
<input class="with-gap" onchange="settings()" name="theme" type="radio" id="brown" value="brown" />
<span>Brown<span class="imas hide">(ビタースイート・タイム)</span></span>
</label>
<label>
<input class="with-gap" onchange="settings()" name="theme" type="radio" id="green" value="green" />
<span>Green<span class="imas hide">(ユースフルロマンス)</span></span>
</label>
<label>
<input class="with-gap" onchange="settings()" name="theme" type="radio" id="custom"
value="custom" />
<span>custom</span>
</label>
<div style="width:300px" id="sel-selector">
<select id="custom-sel-sel" class="custom-sel" onchange="customSel()"></select>
</div>
<h4>Edit and add custom themes</h4>
<div style="width:300px" id="edit-selector" data-add="Add new">
<select id="custom-edit-sel" class="custom-sel" onchange="custom()">
<option value="add_new">Add new</option>
</select>
</div>
<h5>Name</h5>
<input type="text" style="width:300px" id="custom_name" placeholder="Name...">
<h5>About this theme</h5>
<div class="input-field"><textarea style="width:300px" id="custom_desc" class="materialize-textarea"
placeholder="About this theme..."></textarea></div>
<h5>Color scheme</h5>
<label>
<input class="with-gap" onchange="settings()" name="direction" type="radio" id="dark" value="dark"
checked="true" />
<span>Dark</span>
</label>
<label>
<input class="with-gap" onchange="settings()" name="direction" type="radio" id="light"
value="light" />
<span>Light</span>
</label>
<div id="pickers">
<div>
<h5>Primary</h5>Background of components
<div id="color-picker0-wrap">
<div class="color-picker" id="color-picker0"></div>
</div>
<input type="hidden" id="color-picker0_value">
</div>
<div>
<h5>Secondary</h5>Background color
<div id="color-picker1-wrap">
<div class="color-picker" id="color-picker1"></div>
</div>
<input type="hidden" id="color-picker1_value">
</div>
<div>
<h5>Texts</h5>Text color
<div id="color-picker2-wrap">
<div class="color-picker" id="color-picker2"></div>
</div>
<input type="hidden" id="color-picker2_value">
</div>
<div>
<h5>Accent</h5>Background of boosts
<div id="color-picker3-wrap">
<div class="color-picker" id="color-picker3"></div>
</div>
<input type="hidden" id="color-picker3_value">
</div>
</div>
<button class="btn-large waves-effect" onclick="customComp()">Change</button>&nbsp;<button
class="btn waves-effect red disabled" id="delTheme" onclick="deleteIt()">Delete</button><br><br>
<input type="text" style="width:300px;height:40px;" id="custom_json" class="materialize-textarea"
placeholder="JSON style" readonly><br>
Share this code with other TheDesk. Do not share this code with MiAS.
<h4>Import of custom themes</h4>
Get more themes on <a href="https://assets.msky.cafe/" target="_blank">MiAS</a><br>
<input type="text" style="width:300px;height:40px;" id="custom_import" class="materialize-textarea"
placeholder="JSON/JSON5 style">
<button class="btn waves-effect" onclick="customImp()">Import</button><br>
</li>
<li>
<div class="collapsible-header">
<i class="material-icons">reorder</i>Timeline Preferences
</div>
<div class="collapsible-body">
<div id="tlView">
<template v-for="(item, i) in config">
<h5>{{item.text.head}}</h5>
<template v-if="item.text.desc">
<templete v-html="item.text.desc"></templete><br>
</template>
<template v-if="item.checkbox">
<template v-for="(check, j) in item.text.checkbox">
<label>
<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
<span>{{check.text}}</span>
</label>
</template>
</template>
<template v-else>
<template v-if="item.doubleText">
<template v-for="(textbox, j) in item.data">
<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
</template>
</template>
<template v-else>
<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
</template>
<button class="btn waves-effect" style="width:100px;"
v-on:click="complete(i)">Change</button>
</template><br>
</template>
</div>
<h5>Custom sound</h5>
<button class="btn waves-effect" style="width:120px;" onclick="customSound(1)">Custom 1</button><span
id="c1-file"></span><br>
<button class="btn waves-effect" style="width:120px;" onclick="customSound(2)">Custom 2</button><span
id="c2-file"></span><br>
<button class="btn waves-effect" style="width:120px;" onclick="customSound(3)">Custom 3</button><span
id="c3-file"></span><br>
<button class="btn waves-effect" style="width:120px;" onclick="customSound(4)">Custom 4</button><span
id="c4-file"></span><br>
</div>
</li>
<li>
<div class="collapsible-header">
<i class="material-icons">send</i>Posting Preferences
</div>
<div class="collapsible-body">
<div id="postView">
<template v-for="(item, i) in config">
<h5>{{item.text.head}}</h5>
<template v-if="item.text.desc">
<templete v-html="item.text.desc"></templete><br>
</template>
<template v-if="item.checkbox">
<template v-for="(check, j) in item.text.checkbox">
<template v-if="!check.kirishima || (check.kirishima && kirishima)">
<label><input class="with-gap" v-on:click="complete(i,check.value)"
v-model="item.setValue" type="radio" v-bind:id="item.id+check.value"
v-bind:value="check.value" />
<span>{{check.text}}</span></label>
<span v-if="check.kirishimaText">{{check.kirishimaText}}</span>
</template>
</template>
</template>
<template v-else>
<template v-if="item.doubleText">
<template v-for="(textbox, j) in item.data">
<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
</template>
</template>
<template v-else>
<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
</template>
<button class="btn waves-effect" style="width:100px;"
v-on:click="complete(i)">Change</button>
</template><br>
</template>
</div>
</div>
</li>
<li>
<div class="collapsible-header">
<i class="material-icons">keyboard</i>Keyboard shortcut Preferences
</div>
<div class="collapsible-body">
<h5>Easy inserter</h5>
You can insert any letters and emojis with only 3 keys<br>
Ctrl+Shift+1:<input type="text" style="width:150px" id="oks-1">
<button onclick="oks(1)" class="btn waves-effect" style="width:100px;">Save</button><br><br>
Ctrl+Shift+2:<input type="text" style="width:150px" id="oks-2">
<button onclick="oks(2)" class="btn waves-effect" style="width:100px;">Save</button><br><br>
Ctrl+Shift+3:<input type="text" style="width:150px" id="oks-3">
<button onclick="oks(3)" class="btn waves-effect" style="width:100px;">Save</button><br><br>
</div>
</li>
<li>
<div class="collapsible-header">
<i class="material-icons">bookmark</i>Mute & Emphasis Preferences
</div>
<div class="collapsible-body">
<h5>Client Mute</h5>
<div id="mute-cli"></div>
<h5>Client Emphasis</h5>
Click client name on toots to toggle mute and emphasis.
<h5>Words Mute</h5>
Enter to set<br>
<div class="chips" id="wordmute" style="background-color:gray;"></div>
<button onclick="wordmuteSave()" class="btn waves-effect" style="width:100px;">Save</button>
<h5>Words Emphasis</h5>
Enter to set<br>
<div class="chips" id="wordemp" style="background-color:gray;"></div>
<button onclick="wordempSave()" class="btn waves-effect" style="width:100px;">Save</button>
<h5>Users Emphasis</h5>
Set on users data modals.
<span class="emphasized"> Use this color to emphasis </span>
</div>
</li>
<li>
<div class="collapsible-header">
<i class="fa fa-spotify"></i>Spotify and NowPlaying Preferences
</div>
<div class="collapsible-body">
<h5>NowPlaying Provider(Windows)</h5>
macOS and Linux are not supported. AIMP and iTunes were checked by developer. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> For foobar2000, <a href="http://poiru.github.com/foo-cad/">foo_cad plugin</a> is required. And MusicBee requires CAD.<br>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
<span>AIMP</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes"
value="ITUNES" />
<span>iTunes</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm"
value="MEDIAMONKEY" />
<span>MediaMonkey</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp"
value="WINAMP" />
<span>Winamp</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
<span>WMP</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
<span>WLM</span>
</label>
<label>
<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
<span>CAD</span>
</label>
<br><br>
Click <i class="material-icons" style="font-size:24px;">music_note</i>icon to NowPlaying<br>
<h5>Account Connection</h5>
TheDesk save your data on thedesk.top server.<br>
<div id="spotify-code-show" class="hide"><input type="text" id="spotify-code"><button
onclick="spotifyAuth()" class="btn waves-effect" style="width:100px;">Save</button></div>
<a onclick="spotifyConnect()" class="btn waves-effect nex"
style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-enable"><i
class="fa fa-spotify left"></i>Connect</a>
<a onclick="spotifyDisconnect()" class="btn waves-effect nex disabled"
style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable"><i
class="fa fa-spotify left"></i>Disconnect</a>
<h5>Edit a template</h5>
<br>
<textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist}
{url}</textarea><br>
Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify<br>
macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}<br>
Windows:{song}:Song name/{album}:Album name/{artist}:Artist name<br>
<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">Save</button>
<h5>Attach an Artwork of Spotify</h5>
<label>
<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes"
value="yes" />
<span>Yes</span>
</label>
<label>
<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no"
value="no" />
<span>No</span>
</label>
<br>
</div>
</li>
<li>
<div class="collapsible-header">
<i class="material-icons">hearing</i>TTS(text to speech) Preferences
</div>
<div class="collapsible-body">
<h5>Speed</h5>
1-100(default:10)<br>
<p class="range-field"><input type="range" id="voicespeed" min="1" max="100" value="10"
style="width:500px; max-width:100%" /></p>
<h5>Pitch</h5>
0-100(default:50)<br>
<p class="range-field"><input type="range" id="voicepitch" min="0" max="100" value="50"
style="width:500px; max-width:100%" /></p>
<h5>Volume</h5>
0-100(default:100)<br>
<p class="range-field"><input type="range" id="voicevol" min="0" max="100" value="100"
style="width:500px; max-width:100%" /></p>
<h5>Test</h5>
<input type="text" style="width:350px" id="voicetxt" value="TheDesk is an open-source Mastodon client for PC.">
<button class="btn waves-effect blue" style="width:150px;" onclick="voicePlay()"
id="testplay">Play/Stop</button><br>
<br>
<button class="btn waves-effect" style="width:100px;" onclick="voiceSettings()">Save</button>
</div>
</li>
</ul>
<br>
<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i
class="material-icons left">undo</i>Back</a>
<br>
<br>Keyboard shortcuts
<li>Ctrl+1-9:Jump to n(1-9)th column</li>
<li>N:Open toot box</li>
<li>X:Toggle toot box</li>
<li>Ctrl+Enter:Post</li>
<li>Ctrl+Enter+Shift:Post(secondary toot)</li>
<li>Alt+Enter:Secondary Toot Button</li>
<li>Ctrl+E:Make all notifications read</li>
<li>Esc:Hide toot box</li>
<li>F5:Super Reload</li>
<li>Ctrl+Shift+C:Clear toot box</li>
<li>Ctrl+Shift+S:Preferences</li>
<li>Ctrl+Shift+M:Account Manager</li>
<li>Ctrl+Shift+N:NowPlaying(Spotify)</li>
<li>Ctrl+Shift+P:Show profile of selecting</li>
<li>←/→:Show next or previous image</li>
<li>Mousewheel:Zoom a image</li>
<div class="hide kirishima">
以下Markdownに対応したインスタンスのみ。
<br>
<li>Ctrl+B/I/S/U:太字/斜字/取り消し/下線</li>
以下アスタルテにログインしている場合のみ
<br>
<li>Ctrl+R:
<a href="https://astarte.thedesk.top">アスタルテ暇人ランキング</a>を開く
</li><br>
</div>
<button class="btn waves-effect red" style="width:100%; max-width:500px;"
onclick="if(confirm('Delete all data. You cannot undo. Continue?')){ localStorage.clear(); location.href='index.html'; }"><i
class="material-icons left">delete</i>Reset(Danger)</button><br><br>
<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i
class="material-icons left">info</i>About TheDesk</button>
<a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i
class="material-icons left">web</i>Website</a>
<a href="https://www.pixiv.net/fanbox/creator/28105985" class="btn waves-effect red lighten-2"
style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>Support(Pixiv FANBOX)</a>
<a href="https://www.patreon.com/cutls" class="btn waves-effect red darken-2"
style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>Support(Patreon)</a>
<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i
class="material-icons left">list</i>Help/Docs(Constructing)</a>
<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2"
style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
<a href="index.html?mode=user&code=Cutls@cutls.com" class="btn waves-effect blue lighten-2"
style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25"
style="padding-top:5px;">Developer: Cutls@cutls.com</a>
<br>
Kyash<br>
<img src="../../img/kyash.png" width="100"><br>
<a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';"
class="pointer">Check update</a><br>
<a href="oss.html">OSS License</a><br>
<span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018
Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a
href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy
Policy</a>
<br>Developer: Cutls P(
<a href="index.html?mode=user&code=Cutls@cutls.com">@Cutls@cutls.com</a>)
<br>
</span><br>
TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
タグタイムラインを開く:<a href="index.html?mode=tag&code=被災地支援のためのマストドン研究会">#被災地支援のためのマストドン研究会</a><br>
<script type="text/javascript" src="../../js/common/modal.js"></script>
<script type="text/javascript" src="../../js/common/about.js"></script>
<script type="text/javascript" src="../../js/platform/end.js"></script>
<script type="text/javascript" src="../../js/login/logout.js"></script>
<script type="text/javascript" src="../../js/ui/spotify.js"></script>
<script type="text/javascript" src="../../js/tl/speech.js"></script>
<script type="text/javascript" src="../../js/platform/pickr.js"></script>
<script type="text/javascript" src="../../js/ui/settings.js"></script>
<script type="text/javascript" src="../../js/ui/theme.js"></script>
<script type="text/javascript" src="../../js/tl/date.js"></script>

Some files were not shown because too many files have changed in this diff Show More