mirror of
https://github.com/hanzoai/team.git
synced 2026-09-30 01:57:35 +00:00
9ed85b6850
* ci: shard server Postgres tests into 4 parallel runners (#35739) Cherry-pick of00296f9b49from master. * updated go to version 1.25.8 (#35817) Cherry-pick of32a10bac62from master. * Move password hashers from server/v8 to server/public (#35805) Cherry-pick ofcca3f08574from master. * Generate instead of hard-coding test passwords, enforce new minimum for FIPS, shard CI, fix FIPS builds (#35905) Cherry-pick of1bdd985b41from master. * upgrade golangci-lint (#35845) Cherry-pick of157e0400b2from master. On release-11.4 (unlike 11.5), UpdatePostsChannelTypeByChannelId and BackfillPostsChannelType exist in the elasticsearch/opensearch files, so the imports they require (fmt, updatebyquery, scriptlanguage) must be added — they were not in the cherry-pick diff since they already existed on master. Also updates html2text/tablewriter/olekukonko deps to fix a workspace conflict where enterprise's Go 1.25.8 bump pulled in a newer html2text that requires tablewriter ≥ 1.1 (was pinned to 0.0.5 via a replace directive). Matches the subset of866f759e4b(Mm 66662 bump deps) relevant to this incompatibility. * Fix FIPS-incompatible passwords and config in e2e test suites (#36001) Cherry-pick ofb51b4a8937from master. release-11.4 differences vs release-11.5: - demo_plugin_installation.spec.ts also deleted (modify/delete conflict, git rm) - authentication_2_spec.ts conflict: HEAD missing check() call; took incoming (check + FIPS-length passwords) - member_invitation_ui_spec.ts: HEAD has 'Create Account' (capital A) matching release-11.4 button text; kept HEAD's button text with incoming's newTestPassword() * fix(cypress): demo plugin (#36056) Cherry-pick of39f1979aa5from master. demo_plugin_installation.spec.ts was deleted in step 10 (modify/delete); re-created here with both the FIPS-password change and the URL fix. * test: clean up channel store data after TestChannelStore (#36066) TestChannelStore sub-tests create channels, members, and team members using fake TeamIds and UserIds (model.NewId() for non-existent rows). These records are left in the database and cause integrity tests (TestCheck*) running in the same binary to fail their full-table scans. Register a t.Cleanup on TestChannelStore that purges the affected tables entirely. A blanket purge is safe: the schema enforces no FK constraints, and every test suite creates its own data independently. * Fix command injection in server-test-template workflow (#36080) Cherry-pick of9223935f16from master. * fix(ci): restore testname format in sharded gotestsum runs (#36078) run-shard-tests.sh called gotestsum directly without --format, so it fell back to gotestsum's default (pkgname) instead of the testname format set by the Makefile. Pass --format "${GOTESTSUM_FORMAT:-testname}" to match the Makefile default. Co-authored-by: Mattermost Build <[email protected]> * fixup: drop demo_plugin playwright specs — master-only APIs demo_plugin/helpers.ts and demo_plugin_installation.spec.ts use installAndEnablePlugin and isPluginActive which don't exist on release-11.4's PlaywrightExtended type. These files were re-created by the step-11 cherry-pick of39f1979aa5, but they don't compile on this branch (same class of problem as actions.spec.ts in step 10). * fixup: add missing await in PluginLinkTooltip test The test added in39f1979aa5is missing an await on renderWithContext, causing the pointer-events assertion to race. Fix from 0c7d3f27c6 (on a feature branch, not yet on master). * fixup: drop pointer-events test incompatible with jsdom@20 The 'should not block interaction with elements outside the tooltip' test checks getComputedStyle for pointer-events: none, which is set only in SCSS. release-11.4 uses jest-environment-jsdom@29 (jsdom@20), which does not apply stylesheets, so getComputedStyle always returns "". The test passes on release-11.5+ only because they use jest-environment-jsdom@30 (jsdom@25+). Drop the test rather than backport the jsdom upgrade. * fixup: add missing i18n keys for elasticsearch/opensearch functions BackfillPostsChannelType and UpdatePostsChannelTypeByChannelId exist on release-11.4 (unlike release-11.5+). The golangci-lint cherry-pick added new error strings to those functions referencing i18n keys that weren't in en.json. * fixup: run make i18n-extract to reorder keys correctly * fixup: drop terms-and-privacy checkbox from MM-T1774 on release-11.4 The #signup-body-card-form-check-terms-and-privacy element did not exist on release-11.4's signup page. It was added to master after this branch was cut, so the check() call from the incoming cherry-pick causes the test to fail with "element never found". * fixup: remove UpdatePostsChannelTypeByChannelId/BackfillPostsChannelType These functions were introduced by MM-67540 (allow searching public channel messages without channel membership), which never landed on release-11.4. The golangci-lint cherry-pick only modernizes existing code; the rerere resolution incorrectly added the full function bodies from master. Remove both functions and their now-unused imports (fmt, updatebyquery, scriptlanguage) from elasticsearch.go and opensearch.go. Also remove the two i18n keys added to support them. Same treatment as release-11.5, where these functions were also absent. --------- Co-authored-by: Mattermost Build <[email protected]>
103 lines
3.6 KiB
Go
103 lines
3.6 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package model
|
|
|
|
import (
|
|
"strings"
|
|
)
|
|
|
|
const (
|
|
PushNotifyApple = "apple"
|
|
PushNotifyAndroid = "android"
|
|
PushNotifyAppleReactNative = "apple_rn"
|
|
PushNotifyAndroidReactNative = "android_rn"
|
|
|
|
PushTypeMessage = "message"
|
|
PushTypeClear = "clear"
|
|
PushTypeUpdateBadge = "update_badge"
|
|
PushTypeSession = "session"
|
|
PushTypeTest = "test"
|
|
PushMessageV2 = "v2"
|
|
|
|
PushSoundNone = "none"
|
|
|
|
// The category is set to handle a set of interactive Actions
|
|
// with the push notifications
|
|
CategoryCanReply = "CAN_REPLY"
|
|
|
|
// Push notification server URLs
|
|
// Legacy URLs are DNS aliases that automatically route to the regional endpoints
|
|
MHPNSLegacyUS = "https://push.mattermost.com"
|
|
MHPNSLegacyDE = "https://hpns-de.mattermost.com"
|
|
// Current regional URLs
|
|
MHPNSGlobal = "https://global.push.mattermost.com"
|
|
MHPNSUS = "https://us.push.mattermost.com"
|
|
MHPNSEU = "https://eu.push.mattermost.com"
|
|
MHPNSAP = "https://ap.push.mattermost.com"
|
|
MHPNS = MHPNSUS // Legacy constant for backwards compatibility
|
|
|
|
PushSendPrepare = "Prepared to send"
|
|
PushSendSuccess = "Successful"
|
|
PushNotSent = "Not Sent due to preferences"
|
|
PushReceived = "Received by device"
|
|
)
|
|
|
|
// PushSubType allows for passing additional message type information
|
|
// to mobile clients in a backwards-compatible way
|
|
type PushSubType string
|
|
|
|
// PushSubTypeCalls is used by the Calls plugin
|
|
const PushSubTypeCalls PushSubType = "calls"
|
|
|
|
type PushNotificationAck struct {
|
|
Id string `json:"id"`
|
|
ClientReceivedAt int64 `json:"received_at"`
|
|
ClientPlatform string `json:"platform"`
|
|
NotificationType string `json:"type"`
|
|
PostId string `json:"post_id,omitempty"`
|
|
IsIdLoaded bool `json:"is_id_loaded"`
|
|
}
|
|
|
|
type PushNotification struct {
|
|
AckId string `json:"ack_id"`
|
|
Platform string `json:"platform"`
|
|
ServerId string `json:"server_id"`
|
|
DeviceId string `json:"device_id"`
|
|
PostId string `json:"post_id"`
|
|
Category string `json:"category,omitempty"`
|
|
Sound string `json:"sound,omitempty"`
|
|
Message string `json:"message,omitempty"`
|
|
Badge int `json:"badge,omitempty"`
|
|
ContentAvailable int `json:"cont_ava,omitempty"`
|
|
TeamId string `json:"team_id,omitempty"`
|
|
ChannelId string `json:"channel_id,omitempty"`
|
|
RootId string `json:"root_id,omitempty"`
|
|
ChannelName string `json:"channel_name,omitempty"`
|
|
Type string `json:"type,omitempty"`
|
|
SubType PushSubType `json:"sub_type,omitempty"`
|
|
SenderId string `json:"sender_id,omitempty"`
|
|
SenderName string `json:"sender_name,omitempty"`
|
|
OverrideUsername string `json:"override_username,omitempty"`
|
|
OverrideIconURL string `json:"override_icon_url,omitempty"`
|
|
FromWebhook string `json:"from_webhook,omitempty"`
|
|
Version string `json:"version,omitempty"`
|
|
IsCRTEnabled bool `json:"is_crt_enabled"`
|
|
IsIdLoaded bool `json:"is_id_loaded"`
|
|
PostType string `json:"-"`
|
|
ChannelType ChannelType `json:"-"`
|
|
Signature string `json:"signature"`
|
|
}
|
|
|
|
func (pn *PushNotification) DeepCopy() *PushNotification {
|
|
pnCopy := *pn
|
|
return &pnCopy
|
|
}
|
|
|
|
func (pn *PushNotification) SetDeviceIdAndPlatform(deviceId string) {
|
|
if platform, id, ok := strings.Cut(deviceId, ":"); ok {
|
|
pn.Platform = platform
|
|
pn.DeviceId = id
|
|
}
|
|
}
|