ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,408 Commits 117 Branches 1,511 Tags
Commit Graph

4261 Commits

Author SHA1 Message Date
Wolfgang Huß
1ff7750918 Remove comment 2019-08-16 18:15:40 +02:00
Wolfgang Huß
0b9a58e317 Wrote and tested the mention of a blocked user on a post of a blocker 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-08-16 18:14:14 +02:00
Wolfgang Huß
efb5c75c24 Refactor after Roberts suggestions, number I 
Start writing tests
 2019-08-16 16:56:14 +02:00
mattwr18
90e5579cab
Merge pull request #1278 from Human-Connection/fix_hashtag_db_import 
Fix hashtag db import
 2019-08-16 14:37:09 +02:00
Matt Rider
dbaa8e687f Fix vue warnings, fix tests, refactor 
- was throwing an error when trying to update commentsCount because of new implementation by @roschaefer which uses countResolver, but there was no related for commentsCount, it was r... also commentsCount is no longer needed anywhere in the code base, it is commentedCount now
 2019-08-16 13:28:55 +02:00
dependabot-preview[bot]
ba1052d337
Bump @hapi/joi from 15.1.0 to 15.1.1 in /backend 
Bumps [@hapi/joi](https://github.com/hapijs/joi) from 15.1.0 to 15.1.1.
- [Release notes](https://github.com/hapijs/joi/releases)
- [Changelog](https://github.com/hapijs/joi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hapijs/joi/compare/v15.1.0...v15.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-16 04:19:32 +00:00
roschaefer
51b734275a The name of the hashtag is now it's ID 
`name` was just a redundant attribute
 2019-08-16 01:49:29 +02:00
Wolfgang Huß
8acccc99d0 Implemented a reason in the Notification 
Used this for displaying in the mentions menu in frontend.
Rewrite backend test.
 2019-08-15 19:29:06 +02:00
Wolfgang Huß
af70d4f717 Get Notification for author for Commenting their Posts 2019-08-15 16:59:42 +02:00
kachulio1
314dfcf413 Throw error if no categories on post creation 
Co-authored-by: mattwr18 <mattwr18@gmail.com>
 2019-08-15 17:55:02 +03:00
Wolfgang Huß
5b5489232f Rename files 2019-08-15 15:47:53 +02:00
Wolfgang Huß
a6eaea70dc Add UpdateComment support for Mentions in Comment 2019-08-15 15:47:13 +02:00
Wolfgang Huß
be98f56651 Merge branch '1017-send-out-notifications-on-create-omment' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 2019-08-15 12:30:18 +02:00
Matt Rider
f0af231975 Merge branch '1017-send-out-notifications-on-create-omment' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-15 12:14:22 +02:00
Wolfgang Huß
b53d17fa6c Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-Notification-about-comment-on-post 2019-08-15 11:33:22 +02:00
Wolfgang Huß
6ab9a3204b Fix the backend test 2019-08-15 11:07:57 +02:00
Wolfgang Huß
0d66cc4dcf Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 
# Conflicts:
#	backend/src/middleware/handleHtmlContent/handleContentData.js
#	backend/src/schema/types/schema.gql
 2019-08-15 10:16:33 +02:00
Matt Rider
569ace137b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-15 10:14:47 +02:00
dependabot-preview[bot]
31fa930ee2
Bump graphql-middleware from 3.0.3 to 3.0.5 in /backend 
Bumps [graphql-middleware](https://github.com/prisma/graphql-middleware) from 3.0.3 to 3.0.5.
- [Release notes](https://github.com/prisma/graphql-middleware/releases)
- [Commits](https://github.com/prisma/graphql-middleware/compare/v3.0.3...v3.0.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-15 04:21:52 +00:00
Robert Schäfer
244a23a3dd
Merge pull request #1257 from Human-Connection/dependabot/npm_and_yarn/backend/neo4j-graphql-js-2.7.0 
Bump neo4j-graphql-js from 2.6.3 to 2.7.0 in /backend
 2019-08-14 23:52:51 +02:00
Wolfgang Huß
e8c1a5fe8d Write backend tests 2019-08-14 18:05:13 +02:00
Robert Schäfer
b6c96b7a57
Merge pull request #1261 from Human-Connection/1201-localise-categories 
Localise categories
 2019-08-14 17:44:21 +02:00
Matt Rider
ee93efd6d9 Localise categories 2019-08-14 13:57:39 +02:00
Wolfgang Huß
67f25104f4 Fixing lint 2019-08-14 13:22:01 +02:00
Wolfgang Huß
825a5f235a Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-14 13:10:19 +02:00
dependabot-preview[bot]
3eb24a85ea
Bump neo4j-graphql-js from 2.6.3 to 2.7.0 in /backend 
Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js) from 2.6.3 to 2.7.0.
- [Release notes](https://github.com/neo4j-graphql/neo4j-graphql-js/releases)
- [Changelog](https://github.com/neo4j-graphql/neo4j-graphql-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/neo4j-graphql/neo4j-graphql-js/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-14 04:25:32 +00:00
roschaefer
d2a6d8c047 Avoid notifications if user was blocked 
Otherwise you would follow a link and get a 404
 2019-08-13 17:16:24 +02:00
roschaefer
6fb926e735 Fix Search.feature in a hacky way 
Ok, we have no control what parameters are passed to the cypher query
generated by `neo4j-graphql-js`. So I'm re-using the `filter` param.
If the `$filter` param is `{}` then we can use COALESCE to turn that
into empty array. Ugh.
 2019-08-13 16:46:52 +02:00
roschaefer
5103bdbc2a Fix tests 2019-08-13 11:50:33 +02:00
Robert Schäfer
bedbb21def Refactor notification spec 
Wow this took me the entire day: If you run `createServer` multiple
times, more and more middlewares get added to the schema. That's why
the test would create 2^n notifications for n times you called
`createServer`. This is related to the following bug:

https://github.com/prisma/graphql-middleware/issues/63
 2019-08-13 11:05:29 +02:00
Robert Schäfer
8de0195cf8 Keep existing filter params + same for text search 2019-08-13 11:05:29 +02:00
Robert Schäfer
5fb60d1132 Implement+test blocking a user on backend 2019-08-13 11:05:29 +02:00
Robert Schäfer
cc1f932803 Refactor tests with Post model 2019-08-13 11:05:29 +02:00
Robert Schäfer
7f509b3201 Implement block/unbock UI 2019-08-13 11:05:29 +02:00
Robert Schäfer
293054a05b Implement block+unblock basic features 2019-08-13 11:05:29 +02:00
Robert Schäfer
700bdcb8f1 Implement+test unblock mutation 2019-08-13 11:05:29 +02:00
Robert Schäfer
f5a59568ab Implement block except for the unfollow feature 2019-08-13 11:05:29 +02:00
Robert Schäfer
05aee24efd Implement+test User.blockedUsers resolver 2019-08-13 11:05:29 +02:00
Robert Schäfer
b63f6b0ba1 Setup blocked relationships in seeds 2019-08-13 11:05:29 +02:00
Robert Schäfer
f8b37b5c1e Remove obsolete relationship 'BLACKLISTED' 2019-08-13 11:05:29 +02:00
Robert Schäfer
6950068a12 Sketch test for #1054 2019-08-13 11:05:29 +02:00
dependabot-preview[bot]
b56cabb8a4
Bump eslint-plugin-jest from 22.15.0 to 22.15.1 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.15.0 to 22.15.1.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.15.0...v22.15.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-13 04:22:43 +00:00
dependabot-preview[bot]
e34c7f196f
Bump apollo-cache-inmemory from 1.6.2 to 1.6.3 in /backend 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.6.2 to 1.6.3.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-cache-inmemory@1.6.2...apollo-cache-inmemory@1.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 14:58:45 +00:00
dependabot-preview[bot]
0fa3333d86
Bump apollo-client from 2.6.3 to 2.6.4 in /backend 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.3...apollo-client@2.6.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 04:28:25 +00:00
Robert Schäfer
425b53a53f
Merge pull request #1228 from Human-Connection/dependabot/docker/backend/node-12.8-alpine 
Bump node from 12.7-alpine to 12.8-alpine in /backend
 2019-08-09 11:57:50 +02:00
Wolfgang Huß
bf92a88bf9
Merge pull request #1223 from Human-Connection/remove-mocks 
Remove obsolete "MOCKS"
 2019-08-09 10:31:42 +02:00
dependabot-preview[bot]
f9bb12f0af
Bump node from 12.7-alpine to 12.8-alpine in /backend 
Bumps node from 12.7-alpine to 12.8-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-09 04:31:08 +00:00
Robert Schäfer
2eaf66378a
Merge pull request #1133 from Human-Connection/384-emotions-on-posts 
Emotions on posts
 2019-08-09 00:37:38 +02:00
Robert Schäfer
963cbbef32 RemovePostEmotions should return deleted object 
@mattwr18 I prefer (I believe it's even best practice) that a delete
mutation should return the deleted object. If you run the delete
mutation again, it should return `null` because there is no object like
that anymore. That way the client knows if a delete mutation has changed
any state in the database.

Also I fixed another bug in the resolver. If your graphql mutation looks
like this:

```gql
mutation {
  RemovePostEmotions(to:{ id:"p15"}, data:{emotion: angry}) {
    from {
      id
      name
    }
    to {
      id
      title
    }
    emotion
  }
}
```

Then you get errors because your resolver does not return the name for
the user or the title for the post anymore. Just use spread operator...
and it's fixed.
 2019-08-08 23:51:26 +02:00
Robert Schäfer
f3e545a913 Fix bug: Only add emotions for authenticated user 2019-08-08 23:10:01 +02:00