mirror of
				https://github.com/cinnyapp/cinny.git
				synced 2025-11-04 14:30:29 +03:00 
			
		
		
		
	Merge branch 'dev' into improve-space
This commit is contained in:
		
						commit
						c0056eae9d
					
				
					 6 changed files with 10 additions and 10 deletions
				
			
		
							
								
								
									
										4
									
								
								.github/workflows/deploy-pull-request.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/deploy-pull-request.yml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -15,7 +15,7 @@ jobs:
 | 
			
		|||
    if: ${{ github.event.workflow_run.conclusion == 'success' }}
 | 
			
		||||
    steps:
 | 
			
		||||
      - name: Download pr number
 | 
			
		||||
        uses: dawidd6/action-download-artifact@07ab29fd4a977ae4d2b275087cf67563dfdf0295
 | 
			
		||||
        uses: dawidd6/action-download-artifact@ac66b43f0e6a346234dd65d4d0c8fbb31cb316e5
 | 
			
		||||
        with:
 | 
			
		||||
          workflow: ${{ github.event.workflow.id }}
 | 
			
		||||
          run_id: ${{ github.event.workflow_run.id }}
 | 
			
		||||
| 
						 | 
				
			
			@ -24,7 +24,7 @@ jobs:
 | 
			
		|||
        id: pr
 | 
			
		||||
        run: echo "id=$(<pr.txt)" >> $GITHUB_OUTPUT
 | 
			
		||||
      - name: Download artifact
 | 
			
		||||
        uses: dawidd6/action-download-artifact@07ab29fd4a977ae4d2b275087cf67563dfdf0295
 | 
			
		||||
        uses: dawidd6/action-download-artifact@ac66b43f0e6a346234dd65d4d0c8fbb31cb316e5
 | 
			
		||||
        with:
 | 
			
		||||
          workflow: ${{ github.event.workflow.id }}
 | 
			
		||||
          run_id: ${{ github.event.workflow_run.id }}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										2
									
								
								.github/workflows/prod-deploy.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/prod-deploy.yml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -52,7 +52,7 @@ jobs:
 | 
			
		|||
          gpg --export | xxd -p
 | 
			
		||||
          echo '${{ secrets.GNUPG_PASSPHRASE }}' | gpg --batch --yes --pinentry-mode loopback --passphrase-fd 0 --armor --detach-sign cinny-${{ steps.vars.outputs.tag }}.tar.gz
 | 
			
		||||
      - name: Upload tagged release
 | 
			
		||||
        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda
 | 
			
		||||
        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8
 | 
			
		||||
        with:
 | 
			
		||||
          files: |
 | 
			
		||||
            cinny-${{ steps.vars.outputs.tag }}.tar.gz
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -11,7 +11,7 @@ RUN npm run build
 | 
			
		|||
 | 
			
		||||
 | 
			
		||||
## App
 | 
			
		||||
FROM nginx:1.27.4-alpine
 | 
			
		||||
FROM nginx:1.29.0-alpine
 | 
			
		||||
 | 
			
		||||
COPY --from=builder /src/dist /app
 | 
			
		||||
COPY --from=builder /src/docker-nginx.conf /etc/nginx/conf.d/default.conf
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										8
									
								
								package-lock.json
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										8
									
								
								package-lock.json
									
										
									
										generated
									
									
									
								
							| 
						 | 
				
			
			@ -99,7 +99,7 @@
 | 
			
		|||
        "prettier": "2.8.1",
 | 
			
		||||
        "sass": "1.56.2",
 | 
			
		||||
        "typescript": "4.9.4",
 | 
			
		||||
        "vite": "5.4.15",
 | 
			
		||||
        "vite": "5.4.19",
 | 
			
		||||
        "vite-plugin-pwa": "0.20.5",
 | 
			
		||||
        "vite-plugin-static-copy": "1.0.4",
 | 
			
		||||
        "vite-plugin-top-level-await": "1.4.4"
 | 
			
		||||
| 
						 | 
				
			
			@ -11331,9 +11331,9 @@
 | 
			
		|||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "node_modules/vite": {
 | 
			
		||||
      "version": "5.4.15",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.15.tgz",
 | 
			
		||||
      "integrity": "sha512-6ANcZRivqL/4WtwPGTKNaosuNJr5tWiftOC7liM7G9+rMb8+oeJeyzymDu4rTN93seySBmbjSfsS3Vzr19KNtA==",
 | 
			
		||||
      "version": "5.4.19",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.19.tgz",
 | 
			
		||||
      "integrity": "sha512-qO3aKv3HoQC8QKiNSTuUM1l9o/XX3+c+VTgLHbJWHZGeTPVAg2XwazI9UWzoxjIJCGCV2zU60uqMzjeLZuULqA==",
 | 
			
		||||
      "license": "MIT",
 | 
			
		||||
      "dependencies": {
 | 
			
		||||
        "esbuild": "^0.21.3",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -110,7 +110,7 @@
 | 
			
		|||
    "prettier": "2.8.1",
 | 
			
		||||
    "sass": "1.56.2",
 | 
			
		||||
    "typescript": "4.9.4",
 | 
			
		||||
    "vite": "5.4.15",
 | 
			
		||||
    "vite": "5.4.19",
 | 
			
		||||
    "vite-plugin-pwa": "0.20.5",
 | 
			
		||||
    "vite-plugin-static-copy": "1.0.4",
 | 
			
		||||
    "vite-plugin-top-level-await": "1.4.4"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -12,7 +12,7 @@ function addRoomToMDirect(mx, roomId, userId) {
 | 
			
		|||
  const mDirectsEvent = mx.getAccountData('m.direct');
 | 
			
		||||
  let userIdToRoomIds = {};
 | 
			
		||||
 | 
			
		||||
  if (typeof mDirectsEvent !== 'undefined') userIdToRoomIds = mDirectsEvent.getContent();
 | 
			
		||||
  if (typeof mDirectsEvent !== 'undefined') userIdToRoomIds = structuredClone(mDirectsEvent.getContent());
 | 
			
		||||
 | 
			
		||||
  // remove it from the lists of any others users
 | 
			
		||||
  // (it can only be a DM room for one person)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue