Merge branch 'hotfix-v1.1.1'
This commit is contained in:
		
						commit
						1620aae27c
					
				
					 4 changed files with 10 additions and 5 deletions
				
			
		
							
								
								
									
										5
									
								
								db/migrations/0005-clear-member-cache.sql
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								db/migrations/0005-clear-member-cache.sql
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,5 @@
 | 
				
			||||||
 | 
					BEGIN TRANSACTION;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					DELETE FROM member_cache;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					COMMIT;
 | 
				
			||||||
| 
						 | 
					@ -147,6 +147,6 @@ sync.addTemporaryListener(as, "type:m.room.member", guard("m.room.member",
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
async event => {
 | 
					async event => {
 | 
				
			||||||
	if (event.state_key[0] !== "@") return
 | 
						if (event.state_key[0] !== "@") return
 | 
				
			||||||
	if (utils.eventSenderIsFromDiscord(event.sender)) return
 | 
						if (utils.eventSenderIsFromDiscord(event.state_key)) return
 | 
				
			||||||
	db.prepare("REPLACE INTO member_cache (room_id, mxid, displayname, avatar_url) VALUES (?, ?, ?, ?)").run(event.room_id, event.sender, event.content.displayname || null, event.content.avatar_url || null)
 | 
						db.prepare("REPLACE INTO member_cache (room_id, mxid, displayname, avatar_url) VALUES (?, ?, ?, ?)").run(event.room_id, event.state_key, event.content.displayname || null, event.content.avatar_url || null)
 | 
				
			||||||
}))
 | 
					}))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										4
									
								
								package-lock.json
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										4
									
								
								package-lock.json
									
										
									
										generated
									
									
									
								
							| 
						 | 
					@ -1,12 +1,12 @@
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  "name": "out-of-your-element",
 | 
					  "name": "out-of-your-element",
 | 
				
			||||||
  "version": "1.1.0",
 | 
					  "version": "1.1.1",
 | 
				
			||||||
  "lockfileVersion": 3,
 | 
					  "lockfileVersion": 3,
 | 
				
			||||||
  "requires": true,
 | 
					  "requires": true,
 | 
				
			||||||
  "packages": {
 | 
					  "packages": {
 | 
				
			||||||
    "": {
 | 
					    "": {
 | 
				
			||||||
      "name": "out-of-your-element",
 | 
					      "name": "out-of-your-element",
 | 
				
			||||||
      "version": "1.1.0",
 | 
					      "version": "1.1.1",
 | 
				
			||||||
      "license": "AGPL-3.0-or-later",
 | 
					      "license": "AGPL-3.0-or-later",
 | 
				
			||||||
      "dependencies": {
 | 
					      "dependencies": {
 | 
				
			||||||
        "@chriscdn/promise-semaphore": "^2.0.1",
 | 
					        "@chriscdn/promise-semaphore": "^2.0.1",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,6 +1,6 @@
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  "name": "out-of-your-element",
 | 
					  "name": "out-of-your-element",
 | 
				
			||||||
  "version": "1.1.0",
 | 
					  "version": "1.1.1",
 | 
				
			||||||
  "description": "A bridge between Matrix and Discord",
 | 
					  "description": "A bridge between Matrix and Discord",
 | 
				
			||||||
  "main": "index.js",
 | 
					  "main": "index.js",
 | 
				
			||||||
  "repository": {
 | 
					  "repository": {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue