Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(files): nsfw scan memory limit #2655

Merged
merged 9 commits into from
Apr 12, 2022
Merged

fix(files): nsfw scan memory limit #2655

merged 9 commits into from
Apr 12, 2022

Conversation

josephmcg
Copy link
Contributor

@josephmcg josephmcg commented Mar 31, 2022

What this PR does 📖

  • prevent crash by placing a memory limit on scan
  • rename our nsfw limits accordingly
  • remove guard clause for what I thought was a buffer issue. It was from video scan
  • progress bar on upload and download
  • status messages during upload indicating which file / index update
  • fix unrelated display issue where mobile hamburger menu is present in desktop view
  • fix css issue for fullscreen file view icons, close popup was cutoff. Improve overall layout using padding so progress bar wont touch the sides on mobile

Which issue(s) this PR fixes 🔨
AP-1280, AP-918

Special notes for reviewers 🗒️

Additional comments 🎤

@github-actions github-actions bot added the Missing Dev Review A Dev and a Dev Approver need to review the PR, then mark as Ready for QA label Mar 31, 2022
@netlify
Copy link

netlify bot commented Mar 31, 2022

Yeeeehaw, deploy preview is ready!

Name Link
🔨 Latest commit aa8398f
🔍 Latest deploy log https://app.netlify.com/sites/adoring-edison-dbcef8/deploys/62453fb0f9d88000086dff77
😎 Deploy Preview https://deploy-preview-2655--adoring-edison-dbcef8.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@netlify
Copy link

netlify bot commented Mar 31, 2022

Yeeeehaw, deploy preview is ready!

Name Link
🔨 Latest commit 59d1954
🔍 Latest deploy log https://app.netlify.com/sites/adoring-edison-dbcef8/deploys/62551e98ecd01c000840067b
😎 Deploy Preview https://deploy-preview-2655--adoring-edison-dbcef8.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@WanderingHogan WanderingHogan added Ready for QA Ready for QA team to test, Devs approved. and removed Missing Dev Review A Dev and a Dev Approver need to review the PR, then mark as Ready for QA labels Mar 31, 2022
@phillsatellite
Copy link
Contributor

Tested: Should an error message or something similar appear when trying to upload? I used same file Sara used for the crash and so far no crash has just been loading for about 10 mins now
Screen Shot 2022-03-31 at 5 06 14 PM

@phillsatellite phillsatellite added temporary blocked checking something QA Lead is checking something. and removed Ready for QA Ready for QA team to test, Devs approved. labels Mar 31, 2022
@josephmcg
Copy link
Contributor Author

josephmcg commented Apr 1, 2022

would be helpful to check your network tab to see if it's pushing the file to textile. How much ram do you have? How's your internet?

I want to add a progress meter, I just haven't gotten around to it yet

@phillsatellite
Copy link
Contributor

@josephmcg Hello! Not sure if this screenshot helps or not, I also have 16GB Ram and internet is 264.6Mbps
Screen Shot 2022-04-04 at 10 46 31 AM

@josephmcg
Copy link
Contributor Author

josephmcg commented Apr 6, 2022

@phillsatellite I added a progress meter on uploads so this should be easier to test now

The meter measures the file upload. After that, the filesystem index needs to be updated as well. That explains the additional time after the meter is done

@github-actions github-actions bot added the missing fixing conflict Conflict needs to be handled, then re-tested by devs/qa label Apr 6, 2022
@josephmcg josephmcg added Ready for QA Ready for QA team to test, Devs approved. and removed missing fixing conflict Conflict needs to be handled, then re-tested by devs/qa temporary blocked checking something QA Lead is checking something. labels Apr 7, 2022
@stavares843
Copy link
Member

Captura de ecrã 2022-04-07, às 15 44 13

trying to upload the 2GB file into files, returns the above error

same file used on previous testing and also by phil

@stavares843 stavares843 added Changes Requested Changes have been requested by Dev or QA, once the changes have been made, remove this label. and removed Ready for QA Ready for QA team to test, Devs approved. labels Apr 7, 2022
@josephmcg
Copy link
Contributor Author

Thanks, I'm trying some things out.. Can't fully test without these two bug fixes first
#2745
#2783

@josephmcg josephmcg added draft A developer wants eyes on this PR, but they don't think it's ready to merge. and removed draft A developer wants eyes on this PR, but they don't think it's ready to merge. labels Apr 8, 2022
@github-actions github-actions bot added the missing fixing conflict Conflict needs to be handled, then re-tested by devs/qa label Apr 8, 2022
@stavares843
Copy link
Member

#2745 - added comment 🔨
#2783 - merged 🎉

@stavares843
Copy link
Member

#2745 - merged 🎉

@josephmcg josephmcg removed the missing fixing conflict Conflict needs to be handled, then re-tested by devs/qa label Apr 12, 2022
@stavares843 stavares843 added Missing Dev Review A Dev and a Dev Approver need to review the PR, then mark as Ready for QA and removed Changes Requested Changes have been requested by Dev or QA, once the changes have been made, remove this label. labels Apr 12, 2022
@phillsatellite
Copy link
Contributor

phillsatellite commented Apr 12, 2022

For the memory limit, is there supposed to be an error message that appears? Uploadeda 2GB File with no crash also no error message about size

image

@phillsatellite phillsatellite added the temporary blocked checking something QA Lead is checking something. label Apr 12, 2022
@WanderingHogan WanderingHogan added Ready for QA Ready for QA team to test, Devs approved. and removed Missing Dev Review A Dev and a Dev Approver need to review the PR, then mark as Ready for QA labels Apr 12, 2022
@phillsatellite phillsatellite removed the Ready for QA Ready for QA team to test, Devs approved. label Apr 12, 2022
@stavares843
Copy link
Member

Captura de ecrã 2022-04-12, às 23 32 46

the progress bar is pretty neat but disappears if you go to chat and then back to files for example

maybe we can improve that on other PR

besides that, pretty neat 🎉

@stavares843 stavares843 merged commit 87d8692 into dev Apr 12, 2022
@stavares843 stavares843 deleted the AP1280 branch April 12, 2022 22:34
@github-actions github-actions bot removed the temporary blocked checking something QA Lead is checking something. label Apr 12, 2022
@stavares843
Copy link
Member

AP-1395

InfamousVague pushed a commit that referenced this pull request May 28, 2022
* fix(ui): image preview stretch issue (#2815)

* test(cypress): unskip tests, improvements on tests/commands (#2814)

* fix(user): styled as planned on figma (#2506)

* feat(jest): 100% coverage for store/ui/getters (#2820)

* feat(jest): 79% coverage for store/ui/mutations.ts (#2819)

* fix(chat): fix scrollbar appearing while sending message (#2795)

* fix(files): special icon for videos and minor refactor (#2798)

* fix(mobile): hide virtual keyboard when scroll (#2792)

* chore(jest): add coverage on store/friends/mutations.test.ts (#2824)

* chore(cypress): update workflow file from cypress gh action (#2828)

* feat(chat): create older messages info block above chatbar (#2784)

* chore(jest): increase test coverage UserPermissions/index.test.ts (#2833)

* chore(jest): update test (#2834)

* chore(jest): add more test in crypto test (#2835)

* chore(jest): more tests (#2838)

* chore(jest): remove not used imports (#2839)

* chore(jest): add more solana tests (#2842)

* chore(jest): add more coverage (#2843)

* test(cypress): skip chat tests failing in CI (#2830)

* fix(files): nsfw scan memory limit (#2655)

* test(cypress): add tests for invalid image on account creation (#2829)

* feat(search): orderby search results (#2794)

* feat(csam): add toggle for csam scan and save info to textile (#2809)

* chore(jest): resolve eslint warnings (#2850)

* feat(jest): 90% coverage for FilSystem.ts (#2852)

* feat(jest): 97% coverage for store/friends/mutations (#2851)

* feat(files): dropzone for file uploads (#2796)

* test(cypress): skip cypress tests for timeouts (#2861)

* chore(import): remove not used import (#2862)

* chore(import): remove not used import (#2863)

* chore(glyphs): removes description (#2875)

* fix(mobile): user jump between different photo (#2821)

* chore(scrollbar): created new scrollbar component (#2856)

* fix(mobile): virtual keyboard hide chatbox in chat (#2864)

* fix: mobile keyboard update (#2849)

* chore(locales): update locale (#2883)

* chore(update): update bread (#2884)

* fix(chat): show placeholder on image load error (#2818)

* chore(ui): refactor view/message/Friend (#2841)

* test(cypress): add chat reaction tests (#2887)

* chore(refactor): refactor to document title using vue composition api (#2803)

* fix(profile): change quick profile position on error display (#2879)

* chore(jest): add jest test - store/meta/state.test.ts (#2895)

* feat(jest): 100% coverage for store/meta/mutations (#2897)

* fix(replies): display correct reply text (#2882)

* feat(jest): 79% coverage for store/ui/mutations (#2905)

* feat(jest): 22% coverage for MetadataManager (#2906)

* fix(files): missing accent color files (#2891)

* feat(jest): 100% coverage for Directory.ts (#2920)

* chore(jest): increase coverage (#2922)

* chore(jest): increase coverage on store/textile/getters.test.ts (#2925)

* chore(jest): remove skip on test (#2927)

* test(cypress): updates for privacy toggles and fixes (#2909)

* test(cypress): add reaction tests and skip tests failing (#2934)

* chore(vuetify): shrink bundle, remove vuetify (#2904)

* fix(accounts): show hide phrase button (#2907)

* fix(mobile): fix image picker position (#2921)

* fix(chat): fix reply modal disappearing issue (#2911)

* chore(chat): fixed actions position issue replies width (#2900)

* feat(jest): 100% coverage for store/settings/actions (#2937)

* fix(emoji-scroll): emoji persist on scroll (#2924)

* chore(translations): updated sidebar's translations (#2894)

* fix(files): persistent files upload status (#2889)

* feat(account): better image format rules on profile pic creation (#2892)

* feat(ui): user update profile picture (#2903)

* chore(locales): update locale

* feat(jest): 100% coverage for store/textile/getters (#2952)

* feat(settings): nsfw filter user setting (#2917)

* chore(remove): remove redundant comments (#2948)

* fix(mobile): nav profile picture not showing (#2947)

* fix(replies): change avatar color to correct one (#2878)

* chore(skip): skip test

* feat(jest): 86% coverage for BlobToBase64.ts (#2961)

* feat(jest): 100% coverage for store/ui/getters (#2960)

* chore(refactor): upload component refactor (#2717)

* chore(jest): add jest tests (#2914)

* chore(locales): minor improvements (#2943)

* feat(files): large file downloads, improved qol, and improve extension fixing (#2846)

* feat(jest): 65% coverage for store/settings/actions (#2965)

* fix(sidebar): theme color for unread badge (#2954)

* test(cypress): remove privacy toggles screen validations (#2964)

* chore(glyphs): add thumbnail and small copies of glpyhs to boost performance (#2949)

* chore(update): minor update (#2968)

* test(cypress): add tests for profile note (#2967)

* feat(jest): 100% coverage for store/settings/actions (#2969)

* feat(jest): 78% coverage for store/ui/mutations (#2970)

* test(cypress): add tests for context menu (#2974)

* feat(jest): 83% coverage for store/ui/mutations (#2979)

* feat(jest): 100% coverage for store/settings/mutations (#2978)

* feat(csam): prevent files share if consent not granted (#2857)

* fix(files): change position of close button tooltip (#2982)

* fix(files): change line height for image title (#2981)

* fix(settings): remove signaling server setting (#2977)

* test(cypress): add tests for chat search (#2984)

* fix(chat): fix quick reaction context menu (#2980)

* feat(files): blur nsfw image thumbnails based on settings (#2958)

* fix(locales): fix punctuation (#2988)

* feat(jest): 87% coverage for libraries/Solana/Solana (#3001)

* fix(files): store cleanup and additional files status messages (#2971)

* feat(jest): 100% coverage for store/chat/mutations (#3011)

* feat(jest): 100% coverage for store/chat/getters (#3013)

* chore(bundle): minors (#2962)

* chore(typo): fix typo

* chore(typo): fix typo

* test(cypress): add tests for file folder rename (#3014)

* chore(cypress): skip

* test(cypress): add markdown tests (#3018)

* chore(script): add script (#3017)

* feat(jest): 100% coverage for components/views/chat/search/SearchUtil (#3021)

* fix(settings): disable scroll while crop is opening (#3002)

* chore(naming): update naming (#3024)

* feat(jest): 96% coverage for libraries/Solana/Solana (#3036)

* fix(upload): fix leftover errors/progress upload on recipient (#3019)

* feat(jest): 100% coverage for store/accounts/mutations (#3037)

* fix(files): hide unused dropdown (#3039)

* test(cypress): fixes and unskips for tests (#3035)

* fix(files): pluralization logic plus translations for dir item count (#3038)

* chore(emoji-picker): clean up component (#3042)

* fix(sidebar): change styles for friends request label (#2983)

* chore(scrollbar): added new scrollbar to emote (#2899)

* feat(jest): 100% coverage for store/chat/actions (#3051)

* feat(jest): 95% coverage for store/webrtc/mutations (#3050)

* chore(quick-reactions): fixed shadow hover color (#3054)

* refactor(chat): change messages markdown (#3012)

* fix(upload): make error messages look same (#3053)

* chore(profile-icon): changed profile popup icon (#3047)

* chore(reactions): fixed background color (#3056)

* chore(jest): remove duplicated test (#3058)

* chore(lint): minor lint (#3059)

* feat(jest): 100% coverage for store/friends/mutations (#3061)

* fix(status): remove cut off of badge (#3055)

* fix(friend): close context menu on route changed or friend removed (#3057)

* feat(jest): 36% coverage for libraries/Files/TextileFileSystem (#3044)

* test(cypress): add fixes for cypress (#3049)

* test(cypress): more timeout for conversation load (#3067)

* feat(jest): 14% coverage for store/friends/actions (#3074)

* feat(jest): 18% coverage for store/groups/actions (#3073)

* feat(jest): 100% coverage branches for store/sounds/actions (#3083)

* fix(files): set bucket root after each file operation (#3071)

* fix(search): fix z index issue for search and call window (#3081)

* chore(soundmanager): remove unused function (#3086)

* fix(reply): display correct quick profile (#3085)

* test(cypress): add videocall tests (#3095)

* feat(files): recent sidebar functionality (#2997)

* feat(textile): configure textile via env (#3094)

* feat(textile): release the ui asap (#3070)

* fix(search): refine search match criterion (#3080)

* feat(jest): update tests according to code changes (#3104)

* fix(friends): remove friend from indexed db (#3069)

* chore(jest): skip test

* chore(jest): skip test

* chore(jest): skip test

* refactor(chat): remove unnecessary code and fix intellisense (#3072)

* feat(jest): remove skip for timeout issue on Solana (#3125)

* feat(jest): 9% coverage for store/textile/actions (#3126)

* test(cypress): new accounts and unskipping tests (#3117)

* fix(indexeddb): clear idb if user manually deleted localstorage (#3103)

* test(cypress): draft fixes for cypress on CI (#3130)

* chore(cypress): skipped due to PR - 2908

* feat(jest): 89% coverage for libraries/Files/FilSystem (#3135)

* feat(calls): call improvements & group call (#3003)

* chore(jest): add jest tests (#3148)

* feat(icons): add headphones-off-icon (#3123)

* fix(webrtc): add configurable list of stun servers wrtc config (#3163)

* fix(input): improve a11y of interactablesswitch (#3169)

* test(cypress): fixes for tests after videocall updates (#3161)

* feat(notifications): initial textile, store notification set up (#2908)

* feat(files): color contrast for liked status (#3168)

* fix(friends): remove error and searched friend on empty input (#3158)

* test(cypress): skip and fixes cypress tests (#3173)

* chore(jest): add jest tests - 2908 (#2913)

* chore(lint): lint (#3174)

* feat(friendProgram): integrate new friend program using anchor (#2469)

* refactor(z-index): created layers system (#3156)

* fix(user): prevent profile picture drag (#3133)

* feat(jest): 84% coverage for store/ui (#3190)

* fix(glyph): send glyph to active chat (#3187)

* fix(files): hide sidebar options that 100% wont be ready (#3183)

* test(cypress): add swipe tests and new accounts (#3195)

* fix(notification): remove glow from clear all button (#3177)

* fix(message): edit message recipient (#3189)

* fix(edit): edit was not getting friends textile key anymore (#3165)

* fix(footer): adds offline text if user is offline in footer (#3159)

* feat(calls): properly unbind all listeners after call closure (#3196)

* feat(calls): properly unbind all listeners after call closure

* feat(calls): all calls start from audio (for now)

Co-authored-by: Drew Ewing <drew.ewing@satellite.im>

* Revert "feat(calls): properly unbind all listeners after call closure" (#3203)

* feat(calls): properly unbind all listeners after call closure (#3204)

* test(cypress): add save image test and updates to mobiles (#3207)

* refactor(inputs): refactor InteractablesInputGroup (#3154)

* fix(share): remove share for alpha prep (#3215)

* feat(markdown): added markdown preview in sidebar (#3127)

* fix(toolbar): disable group call button (#3216)

* fix(chat): focus on chatbar on send message click (#3157)

* fix(files): width and height for files image view (#3223)

* fix(bundle): remove v clipboard (#3214)

* chore(cypress): skip tests

* fix(hounddog): copy houndog logic to store getters (#3217)

* feat(solana): error popup shows whenever an error occurs to prevent infinite loading (#3062)

* fix(settings): correct audio input/output volume control position (#3235)

* fix(style): disable font ligatures (#3234)

* feat(friends): autofocus add friend input (#3222)

* feat(users): migrate to last version of users program (#3141)

* chore(jest): skip test

* feat(navigation): add translate transition to mobile nav (#3237)

* refactor(style): code refactor and clean up, added flair gradients (#3076)

* test(cypress): update accounts and small fixes (#3243)

* feat(jest): 100% branch coverage for store/chat/mutations (#3252)

* feat(jest): 37% coverage for store/conversation/mutations (#3251)

* feat(jest): 80% coverage for store/ui/mutations (#3250)

* fix(notification): clear alert number on open (#3221)

* fix(chat): auto scroll to the end of the chat, hide older messages in… (#3109)

* test(cypress): skips tests due to solana issues (#3254)

* fix(nametag): fixed tag color (#3247)

* fix(settings): remove mobile redirect to profile modal settings (#3238)

* fix(status): position and size of status (#3160)

* fix(settings): limit modal width/height (#3233)

* feat(media): update mute indicator style (#3220)

* test(cypress): skip tests failing due to textile (#3256)

* chore(typo): fix typo - UNINITIALIZED (#3257)

* chore(userstatus): fixed user state display while changing chat (#3170)

* refactor(friends): move sort methods into getters (#3245)

* chore(jest): organize jest imports (#3258)

* chore(lint): minor lint (#3259)

* feat(jest): 43% coverage for store/conversation/mutations (#3265)

* feat(jest): 100% coverage for store/conversation/getters (#3264)

* test(cypress): skip tests failing due to textile (#3279)

* test(cypress): skip one test on mobiles (#3280)

* chore(imports): remove not used imports (#3260)

* feat(sounds): combine deafen/undeafen into one toggle control (#3218)

* fix(chat): user navigate to chat (#3287)

* fix(friends): fix disabled add friends input bug (#3262)

* feat(jest): 100% coverage for store/conversation/mutations (#3295)

* feat(jest): 94% coverage for store/conversation/action (#3297)

* feat(account): button to delete account on login screen (#3294)

* fix(toolbar): disable call button when in call (#3299)

* fix(search): filter selected by user address (#3298)

* fix(startup): do not await promises in accounts/startup (#3162)

* fix(login): more spacing for delete account link (#3307)

* fix(spacing): reduce link spacing for signin delete account link (#3324)

* feat(jest): 100% branch coverage for store/friends/mutations (#3322)

* feat(jest): 84% coverage for store/video/actions (#3321)

* fix(modal): modal background blur (#3319)

* fix(media): user video class/styling (#3306)

* refactor(tooltip): changed and improved tooltips component (#3227)

* refactor(friends): move friend method from hounddog into getters (#3246)

* fix(solana): fix breaking change in @solana/web3.js (#3327)

* refactor(deps): removed unused dependencies and related code (#3268)

* fix(sidebar): fix toggle mute dispatch (#3236)

* feat(account): add copy phrase button to settings page (#3323)

* fix(user): general refactor, show call options if user is online (#3316)

* feat(files): rework store nsfw, scan consent, update diff instances

Co-authored-by: David Lee <david.lee4015@gmail.com>
Co-authored-by: Luis Cardeña <35935591+luisecm@users.noreply.github.com>
Co-authored-by: Thomas Bosatelli <58808132+ThomBos@users.noreply.github.com>
Co-authored-by: Andre Christoga Pramaditya <caxvis@gmail.com>
Co-authored-by: Nick <81814644+nickjjang@users.noreply.github.com>
Co-authored-by: Joe McGrath <33670767+josephmcg@users.noreply.github.com>
Co-authored-by: Sara Tavares <29093946+stavares843@users.noreply.github.com>
Co-authored-by: Sasha Zakablukov <38879804+AlexZakablukov@users.noreply.github.com>
Co-authored-by: Eric Lee <eric.lee6174@gmail.com>
Co-authored-by: Phill Wisniewski <93608357+phillsatellite@users.noreply.github.com>
Co-authored-by: molimauro <50131258+molimauro@users.noreply.github.com>
Co-authored-by: vimercati-samir <52865716+vimercati-samir@users.noreply.github.com>
Co-authored-by: pavlzk <97599870+pavlzk@users.noreply.github.com>
Co-authored-by: Andrew Ewing <drew@phenocode.com>
Co-authored-by: Jason Woodland <jasonwoodland@me.com>
Co-authored-by: Jeff Kristian <jekrimo@gmail.com>
Co-authored-by: Jason Woodland <me@jasonwoodland.com>
Co-authored-by: Drew Ewing <drew.ewing@satellite.im>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants