995 Commits

Author SHA1 Message Date
ogerly
a6cbbbeaf1 DB rename blurImage to imageBlurred 2019-12-12 10:42:52 +01:00
Alexander Friedland
b89e081bad
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-11 10:39:55 +01:00
roschaefer
cc7cd6b8b0 Fix backend tests 2019-12-10 18:13:34 +01:00
mattwr18
4f0df2f28f Remove disable from query request
- we removed it, prevent null pointer error
2019-12-10 18:09:32 +01:00
mattwr18
0a50a02f88 Follow @roschaefer suggestion/remove guard clauses 2019-12-10 18:09:32 +01:00
mattwr18
12236c9324 Convert to transaction function/refactor
- update incorrect variables
2019-12-10 18:09:32 +01:00
roschaefer
3beef5e3fb Reduce database statements in notifications 2019-12-10 18:09:32 +01:00
roschaefer
b2ccc1b61e Better debugging 2019-12-10 18:09:32 +01:00
mattwr18
4af63ee0aa
Merge pull request #2404 from Human-Connection/get_rid_of_inconsistency_with_setup_neode
Get rid of inconsistency with neode setup
2019-12-10 11:04:35 +01:00
roschaefer
5271337b49 Reduce the number of database calls even more 2019-12-09 18:49:27 +01:00
mattwr18
79c6bd5c20 Paginate moderations page without losing filtering
Co-authored-by: Tirokk <wolle.huss@pjannto.com>
2019-12-09 16:37:04 +01:00
Robert Schäfer
a3251710fa
Update backend/src/schema/resolvers/users/blockedUsers.spec.js
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
2019-12-06 12:34:33 +01:00
Robert Schäfer
df22f2a5b4
Update backend/src/middleware/hashtags/hashtagsMiddleware.spec.js
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
2019-12-06 12:34:24 +01:00
Alexander Friedland
dee22d33db
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-06 07:21:49 +01:00
roschaefer
fdca5b008b Return empty array instead null for "not reviewed"
@mattwr18 why did you add the null check in th resolver?
2019-12-06 02:47:14 +01:00
roschaefer
2f2bf571ed Eliminate database calls for filed and reviewed
I learned map projections and list comprehensions in cypher tonight!
🎉 So much wow!
2019-12-06 01:57:49 +01:00
mattwr18
4d0df181b6
Merge pull request #2432 from Human-Connection/remove-query-for-disable-property-for-reports
Remove disable from reports.disable Query
2019-12-05 21:14:55 +01:00
mattwr18
9fd4ad47dd
Merge pull request #2317 from Human-Connection/2253-fix-scroll-layout-issue
2253 fix scroll layout issue
2019-12-05 21:02:10 +01:00
roschaefer
8f0ce19f09 Implement getDriver() and getNeode() the same way
I want to introduce `neode` and `neo4j-graphql-js` to my students and
saw this.
2019-12-05 21:00:24 +01:00
Robert Schäfer
b7be0f100b
Merge pull request #2424 from Human-Connection/update-test-description
Update test description
2019-12-05 20:55:59 +01:00
mattwr18
55f25b153c Remove disable from models/Report.js
- we are not setting this property, and it's inclusion in this model
with a default false value meant that there were no errors with seeded
data, but with the data returned from the db_manipulation there was.
2019-12-05 20:31:19 +01:00
mattwr18
be319615f8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2253-fix-scroll-layout-issue 2019-12-05 11:16:16 +01:00
mattwr18
ace7818eac Update test description
- the test clearly tests that the createdAt doesn't change, we changed
the implementation, but didn't change the test description
2019-12-04 19:56:49 +01:00
mattwr18
42540eb909 Remove dead code, code creep 2019-12-04 19:55:48 +01:00
mattwr18
085b59bf4d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-12-04 13:23:06 +01:00
ogerly
6ce797e8ef test review 2019-12-04 11:20:27 +01:00
Robert Schäfer
faefe75fe6
Merge pull request #2335 from Human-Connection/webfinger
fix: Re-enable webfinger feature
2019-12-03 22:49:03 +01:00
roschaefer
a6dd6b4f3a Follow @mattwr18's suggestions 2019-12-03 21:49:17 +01:00
Robert Schäfer
148016e2bf
Update backend/src/activitypub/routes/webfinger.spec.js
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
2019-12-03 21:43:47 +01:00
mattwr18
b3640659bb Add missing unit tests/refactor code
- Refactoring without tests makes it riskier
- Move some tests from resolver to middleware unit tests to live closer
to where the validation happens, remove duplicate tests
- DRY out code
2019-12-03 17:59:59 +01:00
mattwr18
66f1aa8888 Follow @roschaefer PR review suggestions
- Update seed file with more human readable imageAspectRatios
- Remove copy script from Dockerfile to not expose to others. we'll need
to either start a maintenance server, so it has access to both the
backend/public/uploads and cypher-shell, or copy a script to the backend
that creates a csv, which can be copied to the neo4j pod and then loaded
into the cypher.
- Remove unintended changes to deployment/legacy-migration
- Add back image compression to Post images
2019-12-03 15:33:54 +01:00
roschaefer
132c12a7d3 Close neo4j driver sessions
We had this error in our neo4j pod recently:

```
2019-12-02 08:29:42.680+0000 ERROR Unable to schedule bolt session 'bolt-1018230' for execution since there are no available threads to serve it at the moment. You can retry at a later time or consider increasing max thread pool size for bolt connector(s).
2019-12-02 08:29:42.680+0000 ERROR Unable to schedule bolt session 'bolt-1018224' for execution since there are no available threads to serve it at the moment. You can retry at a later time or consider increasing max thread pool size for bolt connector(s).
2019-12-02 08:29:42.681+0000 ERROR Unable to schedule bolt session 'bolt-1018352' for execution since there are no available threads to serve it at the moment. You can retry at a later time or consider increasing max thread pool size for bolt connector(s).
2019-12-02 08:29:42.682+0000 ERROR Unable to schedule bolt session 'bolt-1018243' for execution since there are no available threads to serve it at the moment. You can retry at a later time or consider increasing max thread pool size for bolt connector(s).
```

Apparently the default is 400 threads. So we must have a leak somewhere.
2019-12-02 18:12:11 +01:00
roschaefer
7c6d5b5129 fix: Re-enable webfinger feature
Ok, so here is the plan. Let's give both our cucumber features and your
cypress tests a prominent place to live. That would be the root level
folder of our application. Second, let's revive formerly dead code step
by step.

Ie. move code from the former location `backend/features/` to `features/`
when it is ready. All edge cases should be tested with unit tests in
`backend/`, see my `webfinger.spec.js` as an example.
2019-12-02 17:31:56 +01:00
mattwr18
4ac3f92989 Fix lint 2019-12-02 15:54:51 +01:00
Alina Beck
d97973ab79 request faker images corresponding to set aspect ratios 2019-12-02 16:10:44 +03:00
mattwr18
e4aba5d4df Add test case/Fix message
- Test that the rule is automatically created for new reviews
- Improve English message
2019-12-02 13:56:44 +01:00
mattwr18
c05065f684 Refactor backend
- update script
- use readTxResult for validateReview
- favor more verbose variables
- do not set review.closed as we close the report and the rule at the
moment is set to 'latestReviewUpdatedAtRules' rule, so it's clear the
last review must have been the one that closed the report
2019-12-02 13:38:35 +01:00
ogerly
19d183e13a Merge https://github.com/Human-Connection/Human-Connection into 1746-Blur_explicit_Image_Content 2019-12-02 13:22:42 +01:00
mattwr18
14a689d955 Remove comments 2019-12-02 12:02:15 +01:00
mattwr18
c088c6eac4 Refactor test to avoid unneccessary http request
- Set up/tear down should not needlessly run http requests. These tests
are not designed to test that the report/review process works as
expected. that is the job of their respective unit tests/e2e tests.
2019-11-29 20:48:11 +01:00
mattwr18
7441dbf28c Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-29 20:43:09 +01:00
mattwr18
bbd80fbc23 Add test cases for review workflow 2019-11-29 19:45:52 +01:00
mattwr18
f5545e3976 Fix middleware/spec 2019-11-29 19:45:34 +01:00
mattwr18
5d63dda6ee Refactor validateReport/Review
- Don't throw error if a report already exists since we use MERGE and
that does not create a new resource if it exists. That is tested at the
neo4j(database) level.
- We also have a test to make in reports.spec.js that no duplicate is
created to ensure we didn't make some error on our part.
- Fix some faulty logic in validateReview
2019-11-29 18:47:41 +01:00
mattwr18
c0d9fe5257 Test validationMiddleware validateReport/Review 2019-11-29 18:43:24 +01:00
mattwr18
b7f0bc7164
Merge pull request #2375 from Human-Connection/keep_dots_in_emails
Don't remove sub-addresses in emails
2019-11-29 14:14:25 +01:00
mattwr18
2e54a43417
Merge pull request #2333 from Human-Connection/remove_obsolete_invitation_code
refactor: Remove obsolete code about invitation codes
2019-11-29 13:45:46 +01:00
ogerly
7f3f81822e blur the image ok. 2019-11-28 20:40:35 +01:00
roschaefer
76414dbec7 Fix lint 2019-11-28 18:07:00 +01:00
mattwr18
9990fe2cb2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-28 16:14:23 +01:00