Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Backend - Engine
Minds Backend - Engine
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 127
    • Issues 127
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 27
    • Merge Requests 27
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Registry
    • Registry
  • Packages
    • Packages
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds Backend - EngineMinds Backend - Engine
  • Merge Requests
  • !100

Merged
Opened 2 months ago by Mark Harding@markeharding
  • Report abuse
Report abuse

Epic/reporting and moderation

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b epic/ReportingAndModeration origin/epic/ReportingAndModeration

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/master
git merge --no-ff epic/ReportingAndModeration

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Request to merge epic/ReportingAndModeration into master
  • Email patches
  • Plain diff
Pipeline #62750190 canceled for dd117ff0 on epic/ReportingAndModeration
      Merge request approved.

      Merged by Mark Harding 31 minutes ago

      The changes were merged into master with cb33fe87

      Pipeline #62750342 passed for cb33fe87 on master
            • Discussion 0
            • Commits 104
            • Pipelines 73
            • Changes 126
            • Loading...
            • Mark Harding @markeharding added 1 commit 2 months ago

              added 1 commit

              • eee287d9 - (chore): add mapping file

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 2 months ago

              added 1 commit

              • 4548035e - (fix): if no entity abort notification

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 2 months ago

              added 1 commit

              • 71686151 - (fix): if not an objec then do not send wire notification

              Compare with previous version

            • Mark Harding @markeharding added 43 commits 2 months ago

              added 43 commits

              • 71686151...6c92010b - 36 commits from branch master
              • a1a0f17b - (chore): initial skeleton for new reports system
              • e844f08d - (feat): ability to add all entires to database
              • 8c31a0f2 - (fix): ban should use di events dispatcher
              • 5e905137 - (feat): calculate the action to take based on jury decisions
              • 5efcc585 - (feat): return a single verdict along with hydrated decisions
              • 204729c1 - (chore): add mapping file
              • 85044acf - (feat): add sub reason to reports and make the endpoint work too

              Compare with previous version

              Toggle commit list
            • Mark Harding @markeharding added 1 commit 2 months ago

              added 1 commit

              • af81f2dd - (feat): ensure we are using milliseconds

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 2 months ago

              added 1 commit

              • 9a5fb702 - (feat): ability to return list of available reported content to vote as jury on

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 2 months ago

              added 1 commit

              • c9b0d999 - (feat): jury votes saving

              Compare with previous version

            • Mark Harding @markeharding added 56 commits 2 months ago

              added 56 commits

              • c9b0d999...4b3cc022 - 45 commits from branch master
              • 6fc424de - (chore): initial skeleton for new reports system
              • 3bfcc349 - (feat): ability to add all entires to database
              • 85f3d9e2 - (fix): ban should use di events dispatcher
              • 58a19931 - (feat): calculate the action to take based on jury decisions
              • c53c548f - (feat): return a single verdict along with hydrated decisions
              • d2d9e594 - (chore): add mapping file
              • 644f8682 - (feat): add sub reason to reports and make the endpoint work too
              • c5f90ca6 - (feat): ensure we are using milliseconds
              • 59dd7dce - (feat): ability to return list of available reported content to vote as jury on
              • 55e68a17 - (feat): jury votes saving
              • 3d2737ee - (feat): ability to report, jury working and actions taken, appeals log too

              Compare with previous version

              Toggle commit list
            • Mark Harding @markeharding added 1 commit 2 months ago

              added 1 commit

              • 40b67d4e - (feat): do not exit notifications

              Compare with previous version

            • Mark Harding @markeharding added 6 commits 1 month ago

              added 6 commits

              • 53254822 - (chore): admins only in initial jury
              • 65081579 - (feat): send notification to reporter
              • c4ad5532 - (feat): add notifications to verdicts
              • 182603eb - (chore): do not return for appeal if initial jury overturned
              • 32afddb2 - (feat): stats for reports
              • 58fcde2d - (feat): SEO for moderation

              Compare with previous version

              Toggle commit list
            • Mark Harding @markeharding added 2 commits 1 month ago

              added 2 commits

              • c12ec3cd - (feat): use phone hash vs guid
              • 8d8991ce - (feat): return stats for last 30 days

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 1 month ago

              added 1 commit

              • c9562225 - (fix): most popular report option correctly aggregated

              Compare with previous version

            • Mark Harding @markeharding added 2 commits 1 month ago

              added 2 commits

              • 97da8ae1 - (chore): jury fully working tests
              • a360e3a6 - (chore): working tests for verdicts

              Compare with previous version

            • Mark Harding @markeharding added 2 commits 1 month ago

              added 2 commits

              • 1368711d - (chore): spec tests now working for appeals
              • 7edc36bf - (chore): working tests for UserReport

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 1 month ago

              added 1 commit

              • 5b73ea6a - (feat): working tests for verdict actions

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 1 month ago

              added 1 commit

              • a15d25e9 - (chore): do not abort install because email key not readable

              Compare with previous version

            • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 4 weeks ago

              added 1 commit

              • eb044c1d - (WIP) Auto Reporting with Weights

              Compare with previous version

            • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 4 weeks ago

              added 1 commit

              • dc7ecdc8 - Revert "(WIP) Auto Reporting with Weights"

              Compare with previous version

            • Mark Harding @markeharding added 90 commits 4 weeks ago

              added 90 commits

              • dc7ecdc8...943bdee9 - 88 commits from branch master
              • 6d3737ab - Merge remote-tracking branch 'upstream/master' into update-from-master
              • e52801dd - Merge branch 'update-from-master' into 'epic/ReportingAndModeration'

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 4 weeks ago

              added 1 commit

              • 1bf1843c - (fix): syntax error caused by SEO bad merge?

              Compare with previous version

            • Mark Harding @markeharding added 2 commits 3 weeks ago

              added 2 commits

              • 71f480e6 - (feature) Auto Reporting with Weights
              • 0af1f3ea - Merge branch 'autoreport' into 'epic/ReportingAndModeration'

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 2 weeks ago

              added 1 commit

              • e9b10067 - (wip): ground work to support multiple reports on entities and also urn logic

              Compare with previous version

            • Mark Harding @markeharding added 2 commits 2 weeks ago

              added 2 commits

              • 3e3ad28d - (feature) Configurable Auto Cast
              • 769379dc - Merge branch 'configurable-steward-autocast' into 'epic/ReportingAndModeration'

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 2 weeks ago

              added 1 commit

              • dc60c3c0 - (chore): working spec tests for jury decision flow

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 2 weeks ago

              added 1 commit

              • c776dba3 - (chore): use isUpheld vs isAccepted

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 2 weeks ago

              added 1 commit

              • e67be562 - (feat): strike model and test

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 2 weeks ago

              added 1 commit

              • 684c7f79 - (feat): Strikes with tests

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 2 weeks ago

              added 1 commit

              • 1eaf8c06 - (chore): tests and improvements to verdicts

              Compare with previous version

            • Mark Harding @markeharding added 36 commits 2 weeks ago

              added 36 commits

              • 1eaf8c06...aa3ed9b0 - 35 commits from branch master
              • 5f29f688 - Merge branch 'master' of gitlab.com:minds/engine into epic/ReportingAndModeration

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 2 weeks ago

              added 1 commit

              • 2fea5fdc - (refactor): Reports to Cassandra

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 1 week ago

              added 1 commit

              • 9dbd95e5 - (fix): use Type vs SET/MAP types

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 1 week ago

              added 1 commit

              • 6d209d68 - (wip): restructure reports to use urns

              Compare with previous version

            • Mark Harding @markeharding added 14 commits 1 week ago

              added 14 commits

              • 6d209d68...983b23af - 12 commits from branch master
              • 44b74a9f - Merge branch 'master' of gitlab.com:minds/engine into epic/ReportingAndModeration
              • 3927173f - (wip): changes and refactoring with UI testing

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 1 week ago

              added 1 commit

              • fb2a961c - (fix): if deleted then do not show

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 1 week ago

              added 1 commit

              • c0411b84 - (wip): staging work in progress changes

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 1 week ago

              added 1 commit

              • e1f76dbc - (fix): spec test issues

              Compare with previous version

            • Mark Harding @markeharding added 5 commits 6 days ago

              added 5 commits

              • 7da893d6 - (chore): restore notifs
              • 7afd2b27 - (chore): if user then do not apply deleted flag
              • 443429f6 - (feat): remove strike on reverse
              • 987cf638 - (fix): use seconds vs microseconds
              • 2c6cbbcc - (fix): do not save deleted flag on users

              Compare with previous version

              Toggle commit list
            • Mark Harding @markeharding added 3 commits 6 days ago

              added 3 commits

              • 7f97f49c - (fix): do not allow votes in jury if the jury is closed
              • 545f6462 - (feat): return report by urn on repo
              • cf8726fa - (fix): use seconds not milliseconds

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 6 days ago

              added 1 commit

              • 2acc61f0 - (fix): test against using seconds vs ms

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 6 days ago

              added 1 commit

              • f6610dbc - (feat): do not allow appeal to be made unless just after initial_jury

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 6 days ago

              added 1 commit

              • 01194111 - (fix): allow for groups and channels to be reports more than once but not single posts

              Compare with previous version

            • Mark Harding @markeharding added 2 commits 6 days ago

              added 2 commits

              • 04ca2ae8 - Moderation summons
              • ecb32ca4 - Merge branch 'goal/ReportingAndModeration.summons' into 'epic/ReportingAndModeration'

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 6 days ago

              added 1 commit

              • a4b616ff - (feat): use hydrated entity and export

              Compare with previous version

            • Mark Harding @markeharding added 2 commits 6 days ago

              added 2 commits

              • 93e375c0 - Moderation summons queue
              • ca945dff - Merge branch 'goal/ReportingAndModeration.summons-queue' into 'epic/ReportingAndModeration'

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 5 days ago

              added 1 commit

              • 80cbdc95 - (fix): do not summon jurors who have already voted

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 5 days ago

              added 1 commit

              • 22b46d5f - (refactor): move stats from es to cassandra

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 5 days ago

              added 1 commit

              • aa36b0eb - (feat): do not allow to participate in jury unless summoned

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 5 days ago

              added 1 commit

              • 235974db - (fix): Report should expose isUpheld too

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 5 days ago

              added 1 commit

              • 428fef1c - (fix): set appeals not appeal

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 5 days ago

              added 1 commit

              • bdbd8404 - (fix): acl issues

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 5 days ago

              added 1 commit

              • 8b35aa62 - (fix): acl spec tests require access to type and owner_guid

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 5 days ago

              added 1 commit

              • 0cd7265b - (fix): failing spec tests

              Compare with previous version

            • Mark Harding @markeharding added 7 commits 2 days ago

              added 7 commits

              • 3635ff05 - (feat): Jury duty to add to contributions
              • f63f1e98 - (chore): Lexical changes (Summon to Summons)
              • 8b18b7b5 - (test): Describe and tests for SocketDelegate and Summons
              • 62f007b1 - (test): Appeal and Verdict spec tests
              • 968205b5 - (chore): Cohort validated flag should be on
              • 5b412a64 - (test): Cohort; (fix): Cohort
              • 34f6abf2 - Merge branch 'goal/ReportingAndModeration.dev-1' into 'epic/ReportingAndModeration'

              Compare with previous version

              Toggle commit list
            • Emiliano Balbuena @edgebal added 1 commit 2 days ago

              added 1 commit

              • 2bfd6871 - (chore): Don't set TTL for declined summons

              Compare with previous version

            • Mark Harding @markeharding added 2 commits 2 days ago

              added 2 commits

              • 4e264578 - (chore): Cohort pick procedure
              • f00867a2 - Merge branch 'goal/ReportingAndModeration.cohort-pick' into 'epic/ReportingAndModeration'

              Compare with previous version

            • Mark Harding @markeharding added 2 commits 2 days ago

              added 2 commits

              • 4a1580db - (feat): Export report on strike list (#445 (closed))
              • f2df88d8 - Merge branch 'goal/ReportingAndModeration.strike-entity' into 'epic/ReportingAndModeration'

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 1 day ago

              added 1 commit

              • a3103791 - (feat): export appeal with strike too

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 1 day ago

              added 1 commit

              • 8f04f993 - (feat): strike email

              Compare with previous version

            • Mark Harding @markeharding added 4 commits 1 day ago

              added 4 commits

              • 270dec38 - (feat): send emails on ban
              • ac6b6ac4 - (fix): review should show only upheld
              • feef25cd - (chore): stats should return oveturned not upheld
              • eb73688b - (chore): change notification text to reporter

              Compare with previous version

              Toggle commit list
            • Mark Harding @markeharding added 1 commit 1 day ago

              added 1 commit

              • 72617883 - (fix): failed spec tests

              Compare with previous version

            • Emiliano Balbuena @edgebal added 1 commit 1 day ago

              added 1 commit

              • 88975f5c - (fix): Queue name

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 1 day ago

              added 1 commit

              • 197118f9 - (chore): repolling to 70 seconds

              Compare with previous version

            • Mark Harding @markeharding added 2 commits 22 hours ago

              added 2 commits

              • 31542189 - (chore): R&M feedback 2
              • eadf4ebd - Merge branch 'goal/ReportingAndModeration.dev-2' into 'epic/ReportingAndModeration'

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 15 hours ago

              added 1 commit

              • 9dc49442 - (feat): improved stats

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 57 minutes ago

              added 1 commit

              • d85436cf - (chore): serialized appeal sent

              Compare with previous version

            • Mark Harding @markeharding added 2 commits 54 minutes ago

              added 2 commits

              • 1fb6f1b0 - Shut up, steward, while we test the roll out of reports and moderation
              • a0a5387e - Merge branch 'shutup_steward' into 'epic/ReportingAndModeration'

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 50 minutes ago

              added 1 commit

              • e257397f - (chore): token gaming is a ban

              Compare with previous version

            • Mark Harding @markeharding added 1 commit 32 minutes ago

              added 1 commit

              • dd117ff0 - (fix): test for summonsing

              Compare with previous version

            • Mark Harding @markeharding merged 31 minutes ago

              merged

            • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
            Please register or sign in to reply
            Assignee
            None
            Assign to
            None
            Milestone
            None
            Assign milestone
            None
            Time tracking
            No estimate or time spent
            0
            Labels
            None
            Assign labels
            • View project labels
            Lock merge request
            Unlocked
            3
            3 participants
            user avatar
            Mark Harding
            user avatar
            Emiliano Balbuena
            user avatar
            Brian Hatchet
            Reference: minds/engine!100

            Revert this merge request

            This will create a new commit in order to revert the existing changes.

            Switch branch
            Cancel
            A new branch will be created in your fork and a new merge request will be started.

            Cherry-pick this merge request

            Switch branch
            Cancel
            A new branch will be created in your fork and a new merge request will be started.