Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion charts/background-worker/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ data:
host: brig
port: 8080
{{- if .enableFederation }}
federator:
host: {{ .federator.host }}
port: {{ .federator.port }}
{{- end }}
gundeck:
host: gundeck
port: 8080
Expand Down Expand Up @@ -103,4 +109,4 @@ data:
{{- if .postgresMigration }}
postgresMigration: {{- toYaml .postgresMigration | nindent 6 }}
{{- end }}
{{- end }}
{{- end }}
3 changes: 3 additions & 0 deletions charts/background-worker/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ config:
logLevel: Info
logFormat: StructuredJSON
enableFederation: false # keep in sync with brig, cargohold and galley charts' config.enableFederation as well as wire-server chart's tags.federation
federator:
host: federator
port: 8080
rabbitmq:
host: rabbitmq
port: 5672
Expand Down
4 changes: 4 additions & 0 deletions libs/galley-types/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
, data-default
, errors
, gitignoreSource
, http-types
, imports
, lens
, lib
Expand All @@ -21,6 +22,7 @@
, types-common
, utf8-string
, uuid
, wai-utilities
, wire-api
}:
mkDerivation {
Expand All @@ -36,6 +38,7 @@ mkDerivation {
crypton
data-default
errors
http-types
imports
lens
memory
Expand All @@ -44,6 +47,7 @@ mkDerivation {
types-common
utf8-string
uuid
wai-utilities
wire-api
];
license = lib.licenses.agpl3Only;
Expand Down
4 changes: 4 additions & 0 deletions libs/galley-types/galley-types.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ library
-- cabal-fmt: expand src
exposed-modules:
Galley.Types
Galley.Types.Clients
Galley.Types.Conversations.One2One
Galley.Types.Conversations.Roles
Galley.Types.Error
Galley.Types.Teams

other-modules: Paths_galley_types
Expand Down Expand Up @@ -76,6 +78,7 @@ library
, crypton
, data-default
, errors
, http-types
, imports
, lens >=4.12
, memory
Expand All @@ -84,6 +87,7 @@ library
, types-common >=0.16
, utf8-string
, uuid
, wai-utilities
, wire-api

default-language: GHC2021
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
-- | Most of the errors thrown by galley are defined as static errors in
-- 'Wire.API.Error.Galley' and declared as part of the API. Errors defined here
-- are dynamic, and mostly internal.
module Galley.API.Error
module Galley.Types.Error
( -- * Internal errors
InvalidInput (..),
InternalError (..),
Expand Down
4 changes: 4 additions & 0 deletions libs/galley-types/src/Galley/Types/Teams.hs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ module Galley.Types.Teams
( GetFeatureDefaults (..),
FeatureDefaults (..),
FeatureFlags,
FanoutLimit,
featureDefaults,
notTeamMember,
findTeamMember,
Expand All @@ -40,13 +41,16 @@ import Data.ByteString (toStrict)
import Data.ByteString.UTF8 qualified as UTF8
import Data.Default
import Data.Id (UserId)
import Data.Range (Range)
import Data.SOP
import Data.Set qualified as Set
import Imports
import Wire.API.Team.Feature
import Wire.API.Team.Member
import Wire.API.Team.Permission

type FanoutLimit = Range 1 HardTruncationLimit Int32

-- | Used to extract the feature config type out of 'FeatureDefaults' or
-- related types.
type family ConfigOf a
Expand Down
2 changes: 1 addition & 1 deletion libs/wire-api/src/Wire/API/Routes/Public/Brig.hs
Original file line number Diff line number Diff line change
Expand Up @@ -1289,7 +1289,7 @@ type ClientAPI =
-- - MemberJoin event to self and other, if joining an existing connect conversation (via galley)
-- - ConvCreate event to self, if creating a connect conversation (via galley)
-- - ConvConnect event to self, in some cases (via galley),
-- for details see 'Galley.API.Create.createConnectConversation'
-- for details see 'Wire.ConversationSubsystem.Create.createConnectConversation'
type ConnectionAPI =
Named
"create-connection-unqualified"
Expand Down
5 changes: 5 additions & 0 deletions libs/wire-subsystems/src/Wire/ConversationSubsystem.hs
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,10 @@ data ConversationSubsystem m a where
ConversationAction (tag :: ConversationActionTag) ->
ExtraConversationData ->
ConversationSubsystem r LocalConversationUpdate
CreateConversation ::
Local ConvId ->
Local UserId ->
NewConversation ->
ConversationSubsystem m StoredConversation

makeSem ''ConversationSubsystem
Loading