Fxxking Git Conflict
This commit is contained in:
		
							parent
							
								
									fcdf443b43
								
							
						
					
					
						commit
						3b8c961758
					
				
					 1 changed files with 0 additions and 12 deletions
				
			
		|  | @ -17,33 +17,21 @@ bot.connect(TOKEN, [GatewayIntents.GUILD_MEMBERS, GatewayIntents.GUILD_PRESENCES | ||||||
| const member = <Member> await Member.autoInit(bot, { | const member = <Member> await Member.autoInit(bot, { | ||||||
|   cacheName: 'member', |   cacheName: 'member', | ||||||
|   endpoint: 'GUILD_MEMBER', |   endpoint: 'GUILD_MEMBER', | ||||||
| <<<<<<< HEAD |  | ||||||
|   restURLfuncArgs: ['', ''] |   restURLfuncArgs: ['', ''] | ||||||
| ======= |  | ||||||
|   restURLfuncArgs: ['668753256419426314', '333432936390983680'] |  | ||||||
| >>>>>>> 1bf512bcedb9c129c2ec8e35e50d18ff5177b8cb |  | ||||||
| }) | }) | ||||||
| console.log('getted (cached) ' + member.id) | console.log('getted (cached) ' + member.id) | ||||||
| setInterval(async () => { | setInterval(async () => { | ||||||
|   //refreshed check
 |   //refreshed check
 | ||||||
|   console.log('refreshed check: ' + member.id) |   console.log('refreshed check: ' + member.id) | ||||||
|   //cached
 |   //cached
 | ||||||
| <<<<<<< HEAD |  | ||||||
|   console.log('cache: '+(<Member> cache.get('member', '')).id) |   console.log('cache: '+(<Member> cache.get('member', '')).id) | ||||||
| ======= |  | ||||||
|   console.log('cache: '+(<Member> cache.get('member', '668753256419426314:333432936390983680')).id) |  | ||||||
| >>>>>>> 1bf512bcedb9c129c2ec8e35e50d18ff5177b8cb |  | ||||||
| }, 10000) | }, 10000) | ||||||
| 
 | 
 | ||||||
| setInterval(async() => { | setInterval(async() => { | ||||||
|   member.refresh(bot, { |   member.refresh(bot, { | ||||||
|     cacheName: 'member', |     cacheName: 'member', | ||||||
|     endpoint: 'GUILD_MEMBER', |     endpoint: 'GUILD_MEMBER', | ||||||
| <<<<<<< HEAD |  | ||||||
|     restURLfuncArgs: ['', ''] |     restURLfuncArgs: ['', ''] | ||||||
| ======= |  | ||||||
|     restURLfuncArgs: ['668753256419426314', '333432936390983680'] |  | ||||||
| >>>>>>> 1bf512bcedb9c129c2ec8e35e50d18ff5177b8cb |  | ||||||
|   }) |   }) | ||||||
|   //refreshed
 |   //refreshed
 | ||||||
|   console.log('refreshed: ' + member.id) |   console.log('refreshed: ' + member.id) | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue