Update ci.

.gitlab-ci.yml

@@ -42,38 +42,3 @@ build-osx:
     paths:
     - "*.dmg"
 
-deploy-flatpak:
-  image: python:3-alpine
-  stage: deploy
-  only:
-    - master
-  before_script:
-    - pip3 install awscli
-    - pip3 install awscli-plugin-endpoint
-    - cp -R ci/.aws ~/
-    - sed -i -e "s~REGION~$REGION~g" ~/.aws/config
-    - sed -i -e "s~ENDPOINT_URL~$ENDPOINT_URL~g" ~/.aws/config
-    - sed -i -e "s~AWS_ACCESS_KEY_ID~$AWS_ACCESS_KEY_ID~g" ~/.aws/credentials
-    - sed -i -e "s~AWS_SECRET_ACCESS_KEY~$AWS_SECRET_ACCESS_KEY~g" ~/.aws/credentials
-  script:
-    - aws s3 cp *.flatpak s3://$BUCKET_NAME/spectral/flatpak/artifacts/ --acl public-read
-    - aws s3 rm s3://$BUCKET_NAME/spectral/flatpak/spectral.flatpak
-    - aws s3 cp *.flatpak s3://$BUCKET_NAME/spectral/flatpak/spectral.flatpak --acl public-read
-
-deploy-osx:
-  image: python:3-alpine
-  stage: deploy
-  only:
-    - master
-  before_script:
-    - pip3 install awscli
-    - pip3 install awscli-plugin-endpoint
-    - cp -R ci/.aws ~/
-    - sed -i -e "s~REGION~$REGION~g" ~/.aws/config
-    - sed -i -e "s~ENDPOINT_URL~$ENDPOINT_URL~g" ~/.aws/config
-    - sed -i -e "s~AWS_ACCESS_KEY_ID~$AWS_ACCESS_KEY_ID~g" ~/.aws/credentials
-    - sed -i -e "s~AWS_SECRET_ACCESS_KEY~$AWS_SECRET_ACCESS_KEY~g" ~/.aws/credentials
-  script:
-    - aws s3 cp *.dmg s3://$BUCKET_NAME/spectral/osx/artifacts/ --acl public-read
-    - aws s3 rm s3://$BUCKET_NAME/spectral/osx/spectral.dmg
-    - aws s3 cp *.dmg s3://$BUCKET_NAME/spectral/osx/spectral.dmg --acl public-read

ci/.aws/config

@@ -1,14 +0,0 @@
-[plugins]
-endpoint = awscli_plugin_endpoint
-
-[default]
-region = REGION
-s3 =
-  endpoint_url = ENDPOINT_URL
-  signature_version = s3v4  
-  max_concurrent_requests = 1000
-  max_queue_size = 10000
-  multipart_threshold = 50MB
-  multipart_chunksize = 10MB
-s3api =
-  endpoint_url = ENDPOINT_URL

ci/.aws/credentials

@@ -1,3 +0,0 @@
-[default]
-aws_access_key_id=AWS_ACCESS_KEY_ID
-aws_secret_access_key=AWS_SECRET_ACCESS_KEY

src/messageeventmodel.cpp

@@ -313,8 +313,9 @@ QVariant MessageEventModel::data(const QModelIndex& idx, int role) const {
         default:
           break;
       }
-      if (e->hasFileContent())
+      if (e->hasFileContent()) {
         return "file";
+      }
 
       return "message";
     }