"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "services/galley/src/Galley/Data/Types.hs" between
wire-server-2020-06-10.tar.gz and wire-server-2020-06-19.tar.gz

About: Wire (server) offers end-to-end encrypted messaging, file-sharing, video and voice calls, and guest rooms for external communication (back-end server).

Types.hs  (wire-server-2020-06-10):Types.hs  (wire-server-2020-06-19)
skipping to change at line 43 skipping to change at line 43
where where
import Brig.Types.Code import Brig.Types.Code
import Cassandra hiding (Value) import Cassandra hiding (Value)
import qualified Data.ByteString as BS import qualified Data.ByteString as BS
import Data.ByteString.Conversion import Data.ByteString.Conversion
import Data.Id import Data.Id
import Data.Misc (Milliseconds) import Data.Misc (Milliseconds)
import Data.Range import Data.Range
import qualified Data.Text.Ascii as Ascii import qualified Data.Text.Ascii as Ascii
import Galley.Types (Access, AccessRole, ConvType (..), Member (..), ReceiptMode ) import Galley.Types (Access, AccessRole, ConvType (..), Member, ReceiptMode)
import Imports import Imports
import OpenSSL.EVP.Digest (digestBS, getDigestByName) import OpenSSL.EVP.Digest (digestBS, getDigestByName)
import OpenSSL.Random (randBytes) import OpenSSL.Random (randBytes)
-- | Internal conversation type, corresponding directly to database schema. -- | Internal conversation type, corresponding directly to database schema.
-- Should never be sent to users (and therefore doesn't have 'FromJSON' or -- Should never be sent to users (and therefore doesn't have 'FromJSON' or
-- 'ToJSON' instances). -- 'ToJSON' instances).
data Conversation = Conversation data Conversation = Conversation
{ convId :: ConvId, { convId :: ConvId,
convType :: ConvType, convType :: ConvType,
skipping to change at line 65 skipping to change at line 65
convName :: Maybe Text, convName :: Maybe Text,
convAccess :: [Access], convAccess :: [Access],
convAccessRole :: AccessRole, convAccessRole :: AccessRole,
convMembers :: [Member], convMembers :: [Member],
convTeam :: Maybe TeamId, convTeam :: Maybe TeamId,
convDeleted :: Maybe Bool, convDeleted :: Maybe Bool,
-- | Global message timer -- | Global message timer
convMessageTimer :: Maybe Milliseconds, convMessageTimer :: Maybe Milliseconds,
convReceiptMode :: Maybe ReceiptMode convReceiptMode :: Maybe ReceiptMode
} }
deriving (Eq, Show, Generic) deriving (Show)
isSelfConv :: Conversation -> Bool isSelfConv :: Conversation -> Bool
isSelfConv = (SelfConv ==) . convType isSelfConv = (SelfConv ==) . convType
isO2OConv :: Conversation -> Bool isO2OConv :: Conversation -> Bool
isO2OConv = (One2OneConv ==) . convType isO2OConv = (One2OneConv ==) . convType
isTeamConv :: Conversation -> Bool isTeamConv :: Conversation -> Bool
isTeamConv = isJust . convTeam isTeamConv = isJust . convTeam
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)