OpenSource/Sharkey
OpenSource/Sharkey
1
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey.git synced 2024-12-13 21:40:45 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2511 from Hiramiya/avatarbannerfiletypes

Browse source 
Prevent setting non-image files as avatar/banner
This commit is contained in:
syuilo 2018-08-28 07:41:50 +09:00 committed by GitHub
commit 77baca8e6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
locales/en-US.yml
View file

@ -411,6 +411,7 @@ desktop:
uploading-avatar: "Uploading a new avatar"
avatar-updated: "Successfully updated the avatar"
choose-avatar: "Select an image for the avatar"
invalid-filetype: "This filetype is not acceptable here"
desktop/views/components/activity.chart.vue:
total: "Black ... Total"
notes: "Blue ... Notes"

13
src/client/app/desktop/api/update-avatar.ts
View file

@ -6,6 +6,19 @@ import ProgressDialog from '../views/components/progress-dialog.vue';
export default (os: OS) => {
const cropImage = file => new Promise((resolve, reject) => {
var regex = RegExp('\.(jpg|jpeg|png|gif|webp|bmp|tiff)$')
if(!regex.test(file.name) ) {
os.apis.dialog({
title: '%fa:info-circle% %i18n:desktop.invalid-filetype%',
text: null,
actions: [{
text: '%i18n:common.got-it%'
}]
});
reject
}
const w = os.new(CropWindow, {
image: file,
title: '%i18n:desktop.avatar-crop-title%',

14
src/client/app/desktop/api/update-banner.ts
View file

@ -6,6 +6,20 @@ import ProgressDialog from '../views/components/progress-dialog.vue';
export default (os: OS) => {
const cropImage = file => new Promise((resolve, reject) => {
var regex = RegExp('\.(jpg|jpeg|png|gif|webp|bmp|tiff)$')
if(!regex.test(file.name) ) {
os.apis.dialog({
title: '%fa:info-circle% %i18n:desktop.invalid-filetype%',
text: null,
actions: [{
text: '%i18n:common.got-it%'
}]
});
reject
}
const w = os.new(CropWindow, {
image: file,
title: '%i18n:desktop.banner-crop-title%',