diff --git a/app/js/post/post.js b/app/js/post/post.js index 9d9e49dd..f35c8a43 100644 --- a/app/js/post/post.js +++ b/app/js/post/post.js @@ -122,6 +122,10 @@ function post(mode, postvis) { console.log('This toot will be posted at:' + scheduled) schedule() toot.scheduled_at = scheduled + if($('#sch-box').hasClass('expire')) { + toot.scheduled_at = null + toot.expires_at = scheduled + } } else { var scheduled = '' } @@ -195,6 +199,20 @@ function post(mode, postvis) { } } } +function expPostMode() { + $('#sch-box').toggleClass('expire') + if($('#sch-box').hasClass('expire')) { + Swal.fire({ + type: 'info', + title: 'Expiring toot On' + }) + } else { + Swal.fire({ + type: 'info', + title: 'Expireing toot Off' + }) + } +} function misskeyPost() { var str = $('#textarea').val() var acct_id = $('#post-acct-sel').val() diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js index 58c8924e..1a1a0b1d 100644 --- a/app/js/tl/parse.js +++ b/app/js/tl/parse.js @@ -950,7 +950,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { if (!quoteUser) { quoteUser = toot.quote.account.acct } - if(toot.quote_muted) { + if(!toot.quote.quote_muted) { poll = poll + `
diff --git a/app/package.json b/app/package.json index 051f37e9..1be1c7d4 100644 --- a/app/package.json +++ b/app/package.json @@ -51,17 +51,17 @@ ], "license": "GPL-3.0", "dependencies": { - "@fortawesome/fontawesome-free": "^5.13.0", + "@fortawesome/fontawesome-free": "^5.13.1", "custom-electron-titlebar": "^3.2.2-hotfix62", "electron-dl": "^3.0.1", - "jimp": "^0.10.3", + "jimp": "^0.14.0", "jquery": "^3.5.0", "jquery-ui-dist": "^1.12.1", "json5": "^2.1.3", "lodash": "^4.17.15", "materialize-css": "git://github.com/cutls/materialize#v1-dev", "sumchecker": "^3.0.1", - "sweetalert2": "^9.10.12", + "sweetalert2": "^9.15.2", "system-font-families": "^0.4.1", "vue": "^2.6.11" }, @@ -70,7 +70,7 @@ }, "devDependencies": { "chokidar": "^3.3.1", - "electron": "^8.2.3", + "electron": "^9.0.5", "electron-builder": "^22.5.1", "electron-rebuild": "^1.10.1", "readline-sync": "1.4.10" diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index ea6d10c3..5b62fb7c 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -404,7 +404,7 @@ style="margin:0" />
- @@postat@@
@@scheduleWarn@@
+ @@postat@@
@@scheduleWarn@@Expire mode(beta)