diff --git a/package-lock.json b/package-lock.json index f235892a..1438961b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6995,14 +6995,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7017,20 +7015,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -7147,8 +7142,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -7160,7 +7154,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7175,7 +7168,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -7183,14 +7175,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -7209,7 +7199,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -7290,8 +7279,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -7303,7 +7291,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -7425,7 +7412,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -15914,13 +15900,8 @@ "resolved": "https://registry.npmjs.org/system-font-families/-/system-font-families-0.4.1.tgz", "integrity": "sha512-XQK5qAYsbEI6SkCEwezRDsPV44T2G4NNQ/xcx7D/8XM3S+rqYlNxsGcLT7vO6vdT4hc/mlRef7S6+KGIetTwdg==", "requires": { - "babel-polyfill": "^6.23.0" - }, - "dependencies": { - "ttfinfo": { - "version": "git+https://github.com/rBurgett/ttfinfo.git#f00e43e2a6d4c8a12a677df20b7804492d50863c", - "from": "git+https://github.com/rBurgett/ttfinfo.git#f00e43e2a6d4c8a12a677df20b7804492d50863c" - } + "babel-polyfill": "^6.23.0", + "ttfinfo": "git+https://github.com/rBurgett/ttfinfo.git#f00e43e2a6d4c8a12a677df20b7804492d50863c" } }, "table": { @@ -16339,6 +16320,10 @@ "integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==", "dev": true }, + "ttfinfo": { + "version": "git+https://github.com/rBurgett/ttfinfo.git#f00e43e2a6d4c8a12a677df20b7804492d50863c", + "from": "git+https://github.com/rBurgett/ttfinfo.git" + }, "tty-browserify": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", diff --git a/src/config/locales/en/translation.json b/src/config/locales/en/translation.json index 578c574e..1b38d4e5 100644 --- a/src/config/locales/en/translation.json +++ b/src/config/locales/en/translation.json @@ -212,6 +212,12 @@ "i": "Open the images", "x": "Show/hide CW and NSFW", "esc": "Close current page" + }, + "report": { + "title": "Reporting this user", + "comment": "Additional comments", + "cancel": "Cancel", + "ok": "Report" } }, "cards": { @@ -222,6 +228,9 @@ "view_toot_detail": "View Toot Detail", "open_in_browser": "Open in Browser", "copy_link_to_toot": "Copy Link to Toot", + "mute": "Mute", + "block": "Block", + "report": "Report", "delete": "Delete", "via": "via {{application}}", "reply": "Reply", diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue b/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue index 77ab6ca7..0b2ef506 100644 --- a/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue +++ b/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue @@ -94,7 +94,10 @@