aa540e73ce
* wip
* Added data migration for populating categories
* wip
* Added data migration for populating categories
* Store WIP
* migration WIP
* category CRUD APIs complete
* category block API WIP
* block category update API done
* Fetcehed data into store
* Started displayting sidebar data
* sidebar WIP
* Dashboard - basic changes
* Sidebar dashboard btn and board switcher UI only
* Sidebar dashboard btn and board switcher UI only
* create category dialog WIP
* Create category webapp side done
* Integrated move card to other category
* board to block
* Disabled dashboard route for now as we'll implement it in phase 2
* WIP
* Added logic to open last board/view on per team level
* Add workspace to teams and boards migrations (#1986)
* Add workspace to teams and boards migrations
* Update json annotations on board models
* boards search dialog WIP
* Seach dialog WIP
* Implemented opening boiard from search results
* Boards switcher styliung
* Handled update category WS event
* Template support
* personal server support and styling fixes
* test fix WIP
* Fixed a bug causing boards to not be moved correctly beteen categories
* Fixed webapp tests
* fix
* Store changes (#2011)
* Permissions phase 1 - Websocket updates (#2014)
* Store changes
* Websockets changes
* Permissions phase 1 - Permissions service (#2015)
* Store changes
* Websockets changes
* Permissions service
* Api and app updates (#2016)
* Store changes
* Websockets changes
* Permissions service
* New API and App changes
* Delete and Patch boards and blocks endpoints
* Used correct variable
* Webapp changes WIP
* Open correct team URL
* Fixed get block API
* Used React context for workspace users
* WIP
* On load navigation sorted out
* WIP
* Nav fix
* categories WS broadcast
* Used real search API
* Fixed unfurl ppreview
* set active team in sidebar
* IMplemented navigation on changing team in sidebar
* Misc fixes
* close rows inside transaction (#2045)
* update syntax for mysql (#2044)
* Upadted mutator for new patchBlock API
* Updated patchBlock API to use new URL
* Listeining to correct event in plugin mode
* Implemented WS messages for category operations:
* Fix duplicated build tags on Makefile
* Sidebar enhancements
* Add missing prefix to SQLite migration and fix flaky tests
* Sidebar boards menu enhancement
* Fix board page interactions (#2144)
* Fix patch board card properties error
* Fix board interactions
* Fix insert blocks interactions
* Fix app tests (#2104)
* Add json1 tag to vscode launch (#2157)
* Fix add, delete and update boards and add board patch generation (#2146)
* Fix update boards and add board patch generation
* Make add board and add template work, as well as deleting a board
* Update the state on board deletion
* Delete unused variable
* Fix bad parenthesis
* Fix board creation inside plugin, options were coming null due websocket message serialization
* update property type mutators to use boards API (#2168)
* Add permissions modal (#2196)
* Initial integration
* Permissions modal, websocket updates and API tests implemented
* Avoid updating/removing user if there is only one admin left
* Fix duplicates on board search
* Adds integration test
* Addressing PR review comments
Co-authored-by: Jesús Espino <jespinog@gmail.com>
* Merge
* I'm able to compile now
* Some fixes around tests execution
* Fixing migrations
* Fixing migrations order
* WIP
* Fixing some other compilation problems on tests
* Some typescript tests fixed
* Fixing javascript tests
* Fixing compilation
* Fixing some problems to create boards
* Load the templates on initial load
* Improvements over initial team templates import
* Adding new fields in the database
* Working on adding duplicate board api
* Removing RootID concept entirely
* Improving a bit the subscriptions
* Fixing store tests for notificationHints
* Fixing more tests
* fixing tests
* Fixing tests
* Fixing tests
* Fixing some small bugs related to templates
* Fixing registration link generation/regeneration
* Fixing cypress tests
* Adding store tests for duplicateBoard and duplicateBlock
* Addressing some TODO comments
* Making the export api simpler
* Add redirect component for old workspace urls
* Removing Dashboard code
* Delete only the built-in templates on update
* fixing tests
* Adding users autocompletion
* Updating snapshots
* Fixing bad merge
* fix panic when creating new card in notifysubscriptions (#2352)
* fix lint errors (#2353)
* fix lint errors
* fix panic when creating new card in notifysubscriptions (#2352)
* fix lint errors
* fix unit test
* Revert "fix unit test"
This reverts commit 0ad78aed65
.
Co-authored-by: Doug Lauder <wiggin77@warpmail.net>
* fix sql syntax error for SearchUsersByTeam (#2357)
* Fix mentions delivery (#2358)
* fix sql syntax error for SearchUsersByTeam
* fix mentions delivery
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* update api for octoClient calls, pass correct variables to mutator (#2359)
* Fixing tests after merge
* Fix sidebar context menu UI issue (#2399)
* Fix notification diff for text blocks (#2386)
* fix notification diff for text blocks; fix various linter errors.
* fix URLs to cards
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* Permissions branch: Fix card links (#2391)
* fix notification diff for text blocks; fix various linter errors.
* fix URLs to cards
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* Fixing sqlite tests
* Fixing server tests
* Update migrations to create global templates. (#2397)
* fix duplicate templates
* revert migrate.go
* update UI for empty templates
* implement updating built-in templates as global (teamId = 0)
* handle error if board not found
* update unit test
* fix more tests
* Update blocks_test.go
Fix merge issue
* fix migration sql error (#2414)
* Fixing frontend tests
* Set target team ID when using a global template (#2419)
* Fix some server tests
* Fixing onboarding creation
* Permissions branch: Fix unit tests and CI errors (part 1) (#2425)
* Fixing some small memory leaks (#2400)
* Fixing some small memory leaks
* fixing tests
* passing the tags to all test targets
* Increasing the timeout of the tests
* Fix some type checkings
* Permissions branch: Fixes all the linter errors (#2429)
* fix linter errors
* Reestructuring the router and splitting in more subcomponents (#2403)
* Reestructuring the router and splitting in more subcomponents
* Removing console.log calls
* Removing unneeded selector
* Addressing PR comment
* Fix redirection to one team when you load directly the boards home path
* Using properly the lastTeamID to redirect the user if needed
* don't allow last admin change/deleted (#2416)
* don't allow last admin change/deleted
* update for i18-extract
* fixed en.json
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Co-authored-by: Harshil Sharma <harshilsharma63@gmail.com>
* Splitting BoardPage component into simpler/smaller components (#2435)
* Splitting BoardPage component into simpler/smaller components
* Removing unneeded import
* Replace go migrate with morph permissions (#2424)
* merge origin/replace-go-migrate-with-morph
* run go mod tidy on mattermost-plugin and increase test timeout
* fix merge issue temprorarily
* remove some debug changes
* fixing the linter
* Allow always team 0 (global) templates fetch (#2472)
* Fix problem with viewId 0 in the URL (#2473)
* Migrate from binddata to goembed (#2471)
* Adding join logic to the board switcher (#2434)
* Adding join logic to the board switcher
* Using already existing client function and removing the joinBoard one
* Adding support for autojoin based on url
* Fixing frontend tests
* fix webapp compile error, missing enableSharedBoards (#2501)
* Fixing duplication on postgres
* Adding back views to the sidebar (#2494)
* Fix #2507. Update Swagger comments (#2508)
* Fix the flash of the template selector on board/team switch (#2490)
* Fix the flash of the template selector on board/team switch
* More fixes specially around error handling
* Fixing the bot badge (#2487)
* simplifying a bit the team store sync between channels and focalboard (#2481)
* Fix menu tests (#2528)
* fix failing menu tests
* fix lint error
* Added keyboard shortcut for boards switcher (#2407)
* Added keyboard shortcut for boards switcher
* Fixed a type error
* Added some inline comments
* Fixed lint
* Fixed bug with scroll jumping when the card is opened: (#2477)
- avoid remounting of `ScrollingComponent` for each render of `Kanban` component
- property `autoFocus` set to false for `CalculationOptions` because it triggers `blur` even for the button in Jest tests and closes the menu
- snapshots for tests with `CalculationOptions` updated
* Adding the frontend support for permissions and applying it to a big part of the interface. (#2536)
* Initial work on permissions gates
* Applying permissions gates in more places
* Adding more checks to the interface
* Adding more permissions gates and keeping the store up to date
* fixing some tests
* Fixing some more tests
* Fixing another test
* Fixing all tests and adding some more
* Adding no-permission snapshot tests
* Addressing PR review comments
* Fixing invert behavior
* Permissions branch: No sqlstore calls after app shutdown (#2530)
* fix webapp compile error, missing enableSharedBoards
* refactor app init wip
* - ensure all block change notifications are finished before shutting down app
- fix unit tests for mysql (insert_at only has 1 second resolution!)
* adjust logging
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* Fixed migrations to allow upgrading from previous version (#2535)
* Added mechanism to check if schema migration is needed
* WIP
* WIP
* WIP
* WIP
* Fixed migration
* Fixed for SQLite
* minor cleaniup
* Deleted old schema migration table after running migrations
* Removed a debug log
* Fixed a bug where the code always tried to delete a table which may or may not exist
* Show properly the user avatar in the ShareBoard component (#2542)
* Fixing the last CI problems from the permissions-branch (#2541)
* Fix history ordering
* Giving some times to avoid possible race conditions
* Empty
* Reverting accidental change in the config.json
* Optimizing table view (#2540)
* Optimizing table view
* Reducing the amount of rendering for tables
* Some other performance improvements
* Improve the activeView updates
* Some extra simplifications
* Another small improvement
* Fixing tests
* Fixing linter errors
* Reducing a bit the amount of dependency with big objects in the store
* Small simplification
* Removing Commenter role from the user role selector (#2561)
* Shareboard cleanup (#2550)
* Initial work on permissions gates
* Applying permissions gates in more places
* Adding more checks to the interface
* Adding more permissions gates and keeping the store up to date
* fixing some tests
* Fixing some more tests
* Fixing another test
* Fixing all tests and adding some more
* Adding no-permission snapshot tests
* Addressing PR review comments
* cleanup some shareboard settings
* remove unused property, fix for user items being displayed for non admin
* revert change, allow users to show
Co-authored-by: Jesús Espino <jespinog@gmail.com>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* Fixing comments and cards with the new optimizations in the store (#2560)
* Fixing property creation (#2563)
* Fix user selection in table view (#2565)
* Fixing focus new row in table view (#2567)
* Permissions branch: Fix sqlite table lock (CI) (#2568)
* fix sqlite table lock
* remove test db on teardown
* revert .gitignore
* fix goimport on migration code
* fix typo
* more linter fixes
* clean up tmp db for sqlstore tests
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* Fixing snapshots
* Migrating center panel to functional component (#2562)
* Migrating center panel to functional component
* Fixing some tests
* Fixing another test
* Fixing linter errors
* Fixing types errors
* Fixing linter error
* Fixing cypress tests
* Fixing the last cypress test
* Simpliying a bit the code
* Making property insertion more robust
* Updating checkbox test
Co-authored-by: Harshil Sharma <harshilsharma63@gmail.com>
Co-authored-by: Miguel de la Cruz <miguel@mcrx.me>
Co-authored-by: Scott Bishel <scott.bishel@mattermost.com>
Co-authored-by: Chen-I Lim <46905241+chenilim@users.noreply.github.com>
Co-authored-by: Doug Lauder <wiggin77@warpmail.net>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Co-authored-by: Harshil Sharma <18575143+harshilsharma63@users.noreply.github.com>
Co-authored-by: Ibrahim Serdar Acikgoz <serdaracikgoz86@gmail.com>
Co-authored-by: kamre <eremchenko@gmail.com>
266 lines
6.9 KiB
Go
266 lines
6.9 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package notifysubscriptions
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/mattermost/focalboard/server/model"
|
|
"github.com/mattermost/focalboard/server/services/store"
|
|
"github.com/mattermost/focalboard/server/utils"
|
|
"github.com/wiggin77/merror"
|
|
|
|
"github.com/mattermost/mattermost-server/v6/shared/mlog"
|
|
)
|
|
|
|
const (
|
|
defBlockNotificationFreq = time.Minute * 2
|
|
enqueueNotifyHintTimeout = time.Second * 10
|
|
hintQueueSize = 20
|
|
)
|
|
|
|
var (
|
|
errEnqueueNotifyHintTimeout = errors.New("enqueue notify hint timed out")
|
|
)
|
|
|
|
// notifier provides block change notifications for subscribers. Block change events are batched
|
|
// via notifications hints written to the database so that fewer notifications are sent for active
|
|
// blocks.
|
|
type notifier struct {
|
|
serverRoot string
|
|
store Store
|
|
delivery SubscriptionDelivery
|
|
logger *mlog.Logger
|
|
|
|
hints chan *model.NotificationHint
|
|
|
|
mux sync.Mutex
|
|
done chan struct{}
|
|
}
|
|
|
|
func newNotifier(params BackendParams) *notifier {
|
|
return ¬ifier{
|
|
serverRoot: params.ServerRoot,
|
|
store: params.Store,
|
|
delivery: params.Delivery,
|
|
logger: params.Logger,
|
|
done: nil,
|
|
hints: make(chan *model.NotificationHint, hintQueueSize),
|
|
}
|
|
}
|
|
|
|
func (n *notifier) start() {
|
|
n.mux.Lock()
|
|
defer n.mux.Unlock()
|
|
|
|
if n.done == nil {
|
|
n.done = make(chan struct{})
|
|
go n.loop()
|
|
}
|
|
}
|
|
|
|
func (n *notifier) stop() {
|
|
n.mux.Lock()
|
|
defer n.mux.Unlock()
|
|
|
|
if n.done != nil {
|
|
close(n.done)
|
|
n.done = nil
|
|
}
|
|
}
|
|
|
|
func (n *notifier) loop() {
|
|
done := n.done
|
|
var nextNotify time.Time
|
|
|
|
for {
|
|
hint, err := n.store.GetNextNotificationHint(false)
|
|
switch {
|
|
case n.store.IsErrNotFound(err):
|
|
// no hints in table; wait up to an hour or when `onNotifyHint` is called again
|
|
nextNotify = time.Now().Add(time.Hour * 1)
|
|
n.logger.Debug("notify loop - no hints in queue", mlog.Time("next_check", nextNotify))
|
|
case err != nil:
|
|
// try again in a minute
|
|
nextNotify = time.Now().Add(time.Minute * 1)
|
|
n.logger.Error("notify loop - error fetching next notification", mlog.Err(err))
|
|
case hint.NotifyAt > utils.GetMillis():
|
|
// next hint is not ready yet; sleep until hint.NotifyAt
|
|
nextNotify = utils.GetTimeForMillis(hint.NotifyAt)
|
|
default:
|
|
// it's time to notify
|
|
n.notify()
|
|
continue
|
|
}
|
|
|
|
n.logger.Debug("subscription notifier loop",
|
|
mlog.Time("next_notify", nextNotify),
|
|
)
|
|
|
|
select {
|
|
case <-n.hints:
|
|
// A new hint was added. Wake up and check if next hint is ready to go.
|
|
case <-time.After(time.Until(nextNotify)):
|
|
// Next scheduled hint should be ready now.
|
|
case <-done:
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
func (n *notifier) onNotifyHint(hint *model.NotificationHint) error {
|
|
n.logger.Debug("onNotifyHint - enqueing hint", mlog.Any("hint", hint))
|
|
|
|
select {
|
|
case n.hints <- hint:
|
|
case <-time.After(enqueueNotifyHintTimeout):
|
|
return errEnqueueNotifyHintTimeout
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (n *notifier) notify() {
|
|
var hint *model.NotificationHint
|
|
var err error
|
|
|
|
hint, err = n.store.GetNextNotificationHint(true)
|
|
if err != nil {
|
|
if store.IsErrNotFound(err) {
|
|
// Expected when multiple nodes in a cluster try to process the same hint at the same time.
|
|
// This simply means the other node won. Returning here will simply try fetching another hint.
|
|
return
|
|
}
|
|
n.logger.Error("notify - error fetching next notification", mlog.Err(err))
|
|
return
|
|
}
|
|
|
|
if err = n.notifySubscribers(hint); err != nil {
|
|
n.logger.Error("Error notifying subscribers", mlog.Err(err))
|
|
}
|
|
}
|
|
|
|
func (n *notifier) notifySubscribers(hint *model.NotificationHint) error {
|
|
// get the subscriber list
|
|
subs, err := n.store.GetSubscribersForBlock(hint.BlockID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if len(subs) == 0 {
|
|
n.logger.Debug("notifySubscribers - no subscribers", mlog.Any("hint", hint))
|
|
return nil
|
|
}
|
|
|
|
// subs slice is sorted by `NotifiedAt`, therefore subs[0] contains the oldest NotifiedAt needed
|
|
oldestNotifiedAt := subs[0].NotifiedAt
|
|
|
|
// need the block's board and card.
|
|
board, card, err := n.store.GetBoardAndCardByID(hint.BlockID)
|
|
if err != nil || board == nil || card == nil {
|
|
return fmt.Errorf("could not get board & card for block %s: %w", hint.BlockID, err)
|
|
}
|
|
|
|
n.logger.Debug("notifySubscribers - subscribers",
|
|
mlog.Any("hint", hint),
|
|
mlog.String("board_id", board.ID),
|
|
mlog.String("card_id", card.ID),
|
|
mlog.Int("sub_count", len(subs)),
|
|
)
|
|
|
|
dg := &diffGenerator{
|
|
board: board,
|
|
card: card,
|
|
store: n.store,
|
|
hint: hint,
|
|
lastNotifyAt: oldestNotifiedAt,
|
|
logger: n.logger,
|
|
}
|
|
diffs, err := dg.generateDiffs()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
n.logger.Debug("notifySubscribers - diffs",
|
|
mlog.Any("hint", hint),
|
|
mlog.Int("diff_count", len(diffs)),
|
|
)
|
|
|
|
if len(diffs) == 0 {
|
|
return nil
|
|
}
|
|
|
|
diffAuthors := make(StringMap)
|
|
for _, d := range diffs {
|
|
diffAuthors.Append(d.Authors)
|
|
}
|
|
|
|
opts := DiffConvOpts{
|
|
Language: "en", // TODO: use correct language with i18n available on server.
|
|
MakeCardLink: func(block *model.Block, board *model.Board, card *model.Block) string {
|
|
return fmt.Sprintf("[%s](%s)", block.Title, utils.MakeCardLink(n.serverRoot, board.TeamID, board.ID, card.ID))
|
|
},
|
|
Logger: n.logger,
|
|
}
|
|
|
|
attachments, err := Diffs2SlackAttachments(diffs, opts)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
merr := merror.New()
|
|
if len(attachments) > 0 {
|
|
for _, sub := range subs {
|
|
// don't notify the author of their own changes.
|
|
authorName, isAuthor := diffAuthors[sub.SubscriberID]
|
|
if isAuthor && len(diffAuthors) == 1 {
|
|
n.logger.Debug("notifySubscribers - deliver, skipping author",
|
|
mlog.Any("hint", hint),
|
|
mlog.String("author_id", sub.SubscriberID),
|
|
mlog.String("author_username", authorName),
|
|
)
|
|
continue
|
|
}
|
|
|
|
n.logger.Debug("notifySubscribers - deliver",
|
|
mlog.Any("hint", hint),
|
|
mlog.String("modified_by_id", hint.ModifiedByID),
|
|
mlog.String("subscriber_id", sub.SubscriberID),
|
|
mlog.String("subscriber_type", string(sub.SubscriberType)),
|
|
)
|
|
|
|
if err = n.delivery.SubscriptionDeliverSlackAttachments(sub.SubscriberID, sub.SubscriberType, attachments); err != nil {
|
|
merr.Append(fmt.Errorf("cannot deliver notification to subscriber %s [%s]: %w",
|
|
sub.SubscriberID, sub.SubscriberType, err))
|
|
}
|
|
}
|
|
} else {
|
|
n.logger.Debug("notifySubscribers - skip delivery; no chg",
|
|
mlog.Any("hint", hint),
|
|
mlog.String("modified_by_id", hint.ModifiedByID),
|
|
)
|
|
}
|
|
|
|
// find the new NotifiedAt based on the newest diff.
|
|
var notifiedAt int64
|
|
for _, d := range diffs {
|
|
if d.UpdateAt > notifiedAt {
|
|
notifiedAt = d.UpdateAt
|
|
}
|
|
for _, c := range d.Diffs {
|
|
if c.UpdateAt > notifiedAt {
|
|
notifiedAt = c.UpdateAt
|
|
}
|
|
}
|
|
}
|
|
|
|
// update the last notified_at for all subscribers since we at least attempted to notify all of them.
|
|
err = dg.store.UpdateSubscribersNotifiedAt(dg.hint.BlockID, notifiedAt)
|
|
if err != nil {
|
|
merr.Append(fmt.Errorf("could not update subscribers notified_at for block %s: %w", dg.hint.BlockID, err))
|
|
}
|
|
|
|
return merr.ErrorOrNil()
|
|
}
|