Merge branch 'develop' into sw-notification-action

This commit is contained in:
tamaina
2021-04-17 00:20:33 +09:00
59 changed files with 2344 additions and 1154 deletions

View File

@@ -1,4 +1,4 @@
import { faAt, faListUl, faEye, faEyeSlash, faBan, faPencilAlt, faComments, faUsers, faMicrophoneSlash, faPlug, faExclamationCircle } from '@fortawesome/free-solid-svg-icons';
import { faAt, faListUl, faEye, faEyeSlash, faBan, faPencilAlt, faComments, faUsers, faMicrophoneSlash, faPlug, faExclamationCircle, faInfoCircle } from '@fortawesome/free-solid-svg-icons';
import { faSnowflake, faEnvelope } from '@fortawesome/free-regular-svg-icons';
import { i18n } from '@client/i18n';
import copyToClipboard from '@client/scripts/copy-to-clipboard';
@@ -126,6 +126,12 @@ export function getUserMenu(user) {
action: () => {
copyToClipboard(`@${user.username}@${user.host || host}`);
}
}, {
icon: faInfoCircle,
text: i18n.locale.info,
action: () => {
os.pageWindow(`/user-info/${user.id}`);
}
}, {
icon: faEnvelope,
text: i18n.locale.sendMessage,